Index: sources/gui/qml/pages/UserConfirmation.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f
--- sources/gui/qml/pages/UserConfirmation.qml	(.../UserConfirmation.qml)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/pages/UserConfirmation.qml	(.../UserConfirmation.qml)	(revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f)
@@ -48,23 +48,17 @@
 
     firstFocusInput : isPassword ? _passwordCurrent : undefined
 
-    Column {
+    contentItem: Column {
         visible: isPassword
 
-        anchors {
-            top                 : parent.top
-            horizontalCenter    : parent.horizontalCenter
-            topMargin           : passwordChangeMode ? 0 : 120
-        }
-
         PasswordEntry { id: _passwordCurrent
             label.text  : ! passwordChangeMode ? "" : qsTr("Current")
             label.width : ! passwordChangeMode ? 0 : labelWidth
             lengthMax   :   passwordLengthMax
             nextInput   : _passwordUpdated
             anchors {
                 top                 : parent.top
-                topMargin           : topMarginContent
+                topMargin           : Variables.defaultMargin * 5
                 horizontalCenter    : parent.horizontalCenter
             }
         }
@@ -131,9 +125,9 @@
         text                    : "Do you ... ?"
         color                   : Colors.textMain
         font.pixelSize          : Fonts.fontPixelTitle
-        anchors.topMargin       : topMarginContent
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter  : parent.verticalCenter
+        anchors.verticalCenterOffset: Variables.defaultMargin * 5 * -1
         horizontalAlignment     : Text.AlignHCenter
         verticalAlignment       : Text.AlignVCenter
     }