diff --git a/picard/ui/options/general.py b/picard/ui/options/general.py
index b29c1af5d..7e6074d5c 100644
--- a/picard/ui/options/general.py
+++ b/picard/ui/options/general.py
@@ -150,9 +150,6 @@ class GeneralOptionsPage(OptionsPage):
             self.ui.login_error.hide()
             self.ui.login.show()
             self.ui.logout.hide()
-        # Workaround for Qt not repainting the view on macOS after the changes.
-        # See https://tickets.metabrainz.org/browse/PICARD-1654
-        self.ui.vboxlayout.parentWidget().repaint()
 
     def login(self):
         self.tagger.mb_login(self.on_login_finished, self)
diff --git a/picard/ui/ui_options_general.py b/picard/ui/ui_options_general.py
index 7c6657b6b..6d7819c50 100644
--- a/picard/ui/ui_options_general.py
+++ b/picard/ui/ui_options_general.py
@@ -59,25 +59,29 @@ class Ui_GeneralOptionsPage(object):
         self.vboxlayout.addWidget(self.groupBox)
         self.rename_files_2 = QtWidgets.QGroupBox(GeneralOptionsPage)
         self.rename_files_2.setObjectName("rename_files_2")
-        self.gridlayout1 = QtWidgets.QGridLayout(self.rename_files_2)
-        self.gridlayout1.setSpacing(2)
-        self.gridlayout1.setObjectName("gridlayout1")
-        self.login = QtWidgets.QPushButton(self.rename_files_2)
-        self.login.setObjectName("login")
-        self.gridlayout1.addWidget(self.login, 3, 0, 1, 1)
-        self.logged_in = QtWidgets.QLabel(self.rename_files_2)
-        self.logged_in.setText("")
-        self.logged_in.setObjectName("logged_in")
-        self.gridlayout1.addWidget(self.logged_in, 1, 0, 1, 3)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.gridlayout1.addItem(spacerItem1, 3, 2, 1, 1)
-        self.logout = QtWidgets.QPushButton(self.rename_files_2)
-        self.logout.setObjectName("logout")
-        self.gridlayout1.addWidget(self.logout, 3, 1, 1, 1)
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.rename_files_2)
+        self.verticalLayout_3.setSpacing(2)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
         self.login_error = QtWidgets.QLabel(self.rename_files_2)
         self.login_error.setText("")
         self.login_error.setObjectName("login_error")
-        self.gridlayout1.addWidget(self.login_error, 0, 0, 1, 3)
+        self.verticalLayout_3.addWidget(self.login_error)
+        self.logged_in = QtWidgets.QLabel(self.rename_files_2)
+        self.logged_in.setText("")
+        self.logged_in.setObjectName("logged_in")
+        self.verticalLayout_3.addWidget(self.logged_in)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setSpacing(6)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.login = QtWidgets.QPushButton(self.rename_files_2)
+        self.login.setObjectName("login")
+        self.horizontalLayout.addWidget(self.login)
+        self.logout = QtWidgets.QPushButton(self.rename_files_2)
+        self.logout.setObjectName("logout")
+        self.horizontalLayout.addWidget(self.logout)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem1)
+        self.verticalLayout_3.addLayout(self.horizontalLayout)
         self.vboxlayout.addWidget(self.rename_files_2)
         self.groupBox_2 = QtWidgets.QGroupBox(GeneralOptionsPage)
         self.groupBox_2.setObjectName("groupBox_2")
@@ -152,9 +156,7 @@ class Ui_GeneralOptionsPage(object):
         QtCore.QMetaObject.connectSlotsByName(GeneralOptionsPage)
         GeneralOptionsPage.setTabOrder(self.server_host, self.server_port)
         GeneralOptionsPage.setTabOrder(self.server_port, self.use_server_for_submission)
-        GeneralOptionsPage.setTabOrder(self.use_server_for_submission, self.login)
-        GeneralOptionsPage.setTabOrder(self.login, self.logout)
-        GeneralOptionsPage.setTabOrder(self.logout, self.analyze_new_files)
+        GeneralOptionsPage.setTabOrder(self.use_server_for_submission, self.analyze_new_files)
         GeneralOptionsPage.setTabOrder(self.analyze_new_files, self.ignore_file_mbids)
         GeneralOptionsPage.setTabOrder(self.ignore_file_mbids, self.check_for_updates)
         GeneralOptionsPage.setTabOrder(self.check_for_updates, self.update_check_days)
diff --git a/ui/options_general.ui b/ui/options_general.ui
index e374f70db..665f28c55 100644
--- a/ui/options_general.ui
+++ b/ui/options_general.ui
@@ -114,50 +114,57 @@ QCheckBox { color: black }</string>
      <property name="title">
       <string>MusicBrainz Account</string>
      </property>
-     <layout class="QGridLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <property name="spacing">
        <number>2</number>
       </property>
-      <item row="3" column="0">
-       <widget class="QPushButton" name="login">
+      <item>
+       <widget class="QLabel" name="login_error">
         <property name="text">
-         <string>Log in</string>
+         <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="3">
+      <item>
        <widget class="QLabel" name="logged_in">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="spacing">
+         <number>6</number>
         </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="3" column="1">
-       <widget class="QPushButton" name="logout">
-        <property name="text">
-         <string>Log out</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="3">
-       <widget class="QLabel" name="login_error">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
+        <item>
+         <widget class="QPushButton" name="login">
+          <property name="text">
+           <string>Log in</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="logout">
+          <property name="text">
+           <string>Log out</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
@@ -299,8 +306,6 @@ QCheckBox { color: black }</string>
   <tabstop>server_host</tabstop>
   <tabstop>server_port</tabstop>
   <tabstop>use_server_for_submission</tabstop>
-  <tabstop>login</tabstop>
-  <tabstop>logout</tabstop>
   <tabstop>analyze_new_files</tabstop>
   <tabstop>ignore_file_mbids</tabstop>
   <tabstop>check_for_updates</tabstop>