diff --git a/resources/qml/Account/AccountWidget.qml b/resources/qml/Account/AccountWidget.qml
index ef1622daee..6433822497 100644
--- a/resources/qml/Account/AccountWidget.qml
+++ b/resources/qml/Account/AccountWidget.qml
@@ -12,8 +12,8 @@ Item
     property var profile: Cura.API.account.userProfile
     property var loggedIn: Cura.API.account.isLoggedIn
 
-    height: signInButton.height > accountWidget.height ? signInButton.height : accountWidget.height
-    width: signInButton.width > accountWidget.width ? signInButton.width : accountWidget.width
+    height: signInButton.visible ? signInButton.height : accountWidget.height
+    width: signInButton.visible ? signInButton.width : accountWidget.width
 
     Button
     {
@@ -54,7 +54,7 @@ Item
         id: accountWidget
 
         anchors.verticalCenter: parent.verticalCenter
-        anchors.horizontalCenter: signInButton.horizontalCenter
+//        anchors.horizontalCenter: signInButton.horizontalCenter
 
         implicitHeight: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
         implicitWidth: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
@@ -142,7 +142,7 @@ Item
             borderColor: UM.Theme.getColor("lining")
             borderWidth: UM.Theme.getSize("default_lining").width
 
-            target: Qt.point(width - (signInButton.width / 2), -10)
+            target: Qt.point(width - ((signInButton.visible ? signInButton.width : accountWidget.width) / 2), -10)
 
             arrowSize: UM.Theme.getSize("default_arrow").width
         }
diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml
index 3e3e5da467..3302c916bb 100644
--- a/resources/qml/MainWindow/MainWindowHeader.qml
+++ b/resources/qml/MainWindow/MainWindowHeader.qml
@@ -146,7 +146,7 @@ Item
         {
             verticalCenter: parent.verticalCenter
             right: accountWidget.left
-//            rightMargin: UM.Theme.getSize("default_margin").width
+            rightMargin: UM.Theme.getSize("default_margin").width
         }
     }