diff --git a/wiki/src/doc/first_steps/startup_options/administration_password.mdwn b/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
index ebcb39dd21b96a218df1fb3e881d8302d4f531af..c883b161464c31299d61e618bd56eaa7375f19fa 100644
--- a/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/administration_password.mdwn
@@ -20,14 +20,16 @@ In order to perform administration tasks, you need to set up an administration
 password when starting Tails, using [[<span class="application">Tails
 Greeter</span>|startup_options#tails_greeter]].
 
-1. When <span class="application">Tails Greeter</span> appears, in the
-   <span class="guilabel">Welcome to Tails</span> window, click on the
-   <span class="button">Yes</span> button. Then click on the
-   <span class="button">Forward</span> button.
-
-2. In the <span class="guilabel">Administration password</span> section, specify
-   a password of your choice in both the <span class="guilabel">Password</span>
-   and <span class="guilabel">Verify Password</span> text boxes.
+1. When <span class="application">Tails Greeter</span> appears, click on the
+   <span class="button">[[!img lib/list-add.png alt="Expand" class="symbolic" link="no"]]</span> button.
+
+2. When the <span class="guilabel">Additional Settings</span> dialog appears,
+   click on <span class="guilabel">Administration Password</span>.
+
+3. Specify a password of your choice in both the
+   <span class="guilabel">Administration Password</span> and
+   <span class="guilabel">Confirm</span> text boxes then click
+   <span class="button">Add</span>.
 
 <a id="open_root_terminal"></a>
 
diff --git a/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn b/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn
index 7f2fbd6ff34e5632fb14ac40376e4922e46f9c27..6e44256a37680294b5bef67403d8036c48f6ee39 100644
--- a/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn
+++ b/wiki/src/doc/first_steps/startup_options/mac_spoofing.mdwn
@@ -108,13 +108,13 @@ Disable MAC address spoofing
 You can disable MAC address spoofing from [[<span class="application">Tails
 Greeter</span>|startup_options#tails_greeter]]:
 
-1. When <span class="application">Tails Greeter</span> appears, in the
-   <span class="guilabel">Welcome to Tails</span> window, click on the
-   <span class="button">Yes</span> button. Then click on the
-   <span class="button">Forward</span> button.
+1. When <span class="application">Tails Greeter</span> appears, click on the
+   <span class="button">[[!img lib/list-add.png alt="Expand" class="symbolic" link="no"]]</span> button.
 
-2. In the <span class="guilabel">MAC address spoofing</span> section, deselect
-   the <span class="guilabel">Spoof all MAC addresses</span> option.
+2. When the <span class="guilabel">Additional Settings</span> dialog appears,
+   click on <span class="guilabel">MAC Address Spoofing</span>.
+
+3. Select the <span class="guilabel">Don't spoof MAC addresses</span> option.
 
 Other considerations
 ====================