diff --git a/ui/NewPrinterWindow.ui b/ui/NewPrinterWindow.ui
index 5f291ed37..634138678 100644
--- a/ui/NewPrinterWindow.ui
+++ b/ui/NewPrinterWindow.ui
@@ -1054,7 +1054,7 @@ ipp://printer.mydomain/ipp</property>
                                                 <property name="halign">start</property>
                                                 <property name="column_homogeneous">True</property>
                                                 <child>
-                                                  <object class="GtkLabel" id="label133">
+                                                  <object class="GtkLabel" id="label132">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">False</property>
                                                     <property name="halign">start</property>
@@ -1062,9 +1062,9 @@ ipp://printer.mydomain/ipp</property>
                                                     <property name="margin_right">12</property>
                                                     <property name="margin_top">6</property>
                                                     <property name="margin_bottom">6</property>
-                                                    <property name="label" translatable="yes">Password:</property>
+                                                    <property name="label" translatable="yes">Username:</property>
                                                     <accessibility>
-                                                      <relation type="label-for" target="entSMBPassword"/>
+                                                      <relation type="label-for" target="entSMBUsername"/>
                                                     </accessibility>
                                                   </object>
                                                   <packing>
@@ -1073,56 +1073,56 @@ ipp://printer.mydomain/ipp</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" id="label132">
+                                                  <object class="GtkEntry" id="entSMBUsername">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="halign">start</property>
+                                                    <property name="can_focus">True</property>
                                                     <property name="margin_left">12</property>
                                                     <property name="margin_right">12</property>
                                                     <property name="margin_top">6</property>
                                                     <property name="margin_bottom">6</property>
-                                                    <property name="label" translatable="yes">Username:</property>
+                                                    <property name="primary_icon_activatable">False</property>
+                                                    <property name="secondary_icon_activatable">False</property>
                                                     <accessibility>
-                                                      <relation type="label-for" target="entSMBUsername"/>
+                                                      <relation type="labelled-by" target="label132"/>
                                                     </accessibility>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">0</property>
-                                                    <property name="top_attach">1</property>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkEntry" id="entSMBPassword">
+                                                  <object class="GtkLabel" id="label133">
                                                     <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
                                                     <property name="margin_left">12</property>
                                                     <property name="margin_right">12</property>
                                                     <property name="margin_top">6</property>
                                                     <property name="margin_bottom">6</property>
-                                                    <property name="visibility">False</property>
-                                                    <property name="primary_icon_activatable">False</property>
-                                                    <property name="secondary_icon_activatable">False</property>
+                                                    <property name="label" translatable="yes">Password:</property>
                                                     <accessibility>
-                                                      <relation type="labelled-by" target="label133"/>
+                                                      <relation type="label-for" target="entSMBPassword"/>
                                                     </accessibility>
                                                   </object>
                                                   <packing>
-                                                    <property name="left_attach">1</property>
-                                                    <property name="top_attach">0</property>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">1</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkEntry" id="entSMBUsername">
+                                                  <object class="GtkEntry" id="entSMBPassword">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="margin_left">12</property>
                                                     <property name="margin_right">12</property>
                                                     <property name="margin_top">6</property>
                                                     <property name="margin_bottom">6</property>
+                                                    <property name="visibility">False</property>
                                                     <property name="primary_icon_activatable">False</property>
                                                     <property name="secondary_icon_activatable">False</property>
                                                     <accessibility>
-                                                      <relation type="labelled-by" target="label132"/>
+                                                      <relation type="labelled-by" target="label133"/>
                                                     </accessibility>
                                                   </object>
                                                   <packing>