diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui
index 70d5271e2..f238c5e3b 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/blackgui/components/logincomponent.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>329</width>
-    <height>735</height>
+    <height>745</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -386,11 +386,11 @@
            <property name="minimumSize">
             <size>
              <width>0</width>
-             <height>50</height>
+             <height>60</height>
             </size>
            </property>
            <property name="focusPolicy">
-            <enum>Qt::StrongFocus</enum>
+            <enum>Qt::NoFocus</enum>
            </property>
           </widget>
          </item>
@@ -399,6 +399,9 @@
       </item>
       <item>
        <widget class="QGroupBox" name="gb_OwnAircraft">
+        <property name="focusPolicy">
+         <enum>Qt::StrongFocus</enum>
+        </property>
         <property name="title">
          <string>Own aircraft</string>
         </property>
@@ -700,6 +703,9 @@
              <height>100</height>
             </size>
            </property>
+           <property name="focusPolicy">
+            <enum>Qt::StrongFocus</enum>
+           </property>
           </widget>
          </item>
          <item>
@@ -931,6 +937,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>tw_Network</tabstop>
   <tabstop>comp_VatsimServers</tabstop>
   <tabstop>pb_OverrideCredentialsVatsim</tabstop>
   <tabstop>tw_Details</tabstop>
@@ -942,6 +949,7 @@
   <tabstop>selector_AircraftIcao</tabstop>
   <tabstop>le_AircraftCombinedType</tabstop>
   <tabstop>selector_AirlineIcao</tabstop>
+  <tabstop>frp_CurrentServer</tabstop>
   <tabstop>le_LoginCallsign</tabstop>
   <tabstop>le_LoginHomeBase</tabstop>
   <tabstop>le_LoginAsAircaft</tabstop>
@@ -955,7 +963,6 @@
   <tabstop>pb_OtherServersGotoSettings</tabstop>
   <tabstop>pb_OverrideCredentialsOtherServers</tabstop>
   <tabstop>sa_FsdDetails</tabstop>
-  <tabstop>tw_Network</tabstop>
  </tabstops>
  <resources>
   <include location="../../blackmisc/blackmisc.qrc"/>