Index: sources/gui/qml/pages/UserConfirmation.qml
===================================================================
diff -u -re7adb742d7dd362b2deb795259694b223eea3bc0 -r6dc7e02773a4823c69b685d8466ea7d58dd320d1
--- sources/gui/qml/pages/UserConfirmation.qml	(.../UserConfirmation.qml)	(revision e7adb742d7dd362b2deb795259694b223eea3bc0)
+++ sources/gui/qml/pages/UserConfirmation.qml	(.../UserConfirmation.qml)	(revision 6dc7e02773a4823c69b685d8466ea7d58dd320d1)
@@ -32,6 +32,7 @@
     confirmEnabled              : ! passwordChangeMode ||
                                   (vSettings.isPasswordHighStrength(_root.passwordUpdated) &&
                                    _root.passwordUpdated === _root.passwordConfirm)
+                property int   labelWidth           : 150
 
                 property bool   isPassword          : false
                 property bool   passwordChangeMode  : false
@@ -64,9 +65,8 @@
             width                           : parent.width / 2.5
 
             PasswordEntry { id: _passwordCurrent
-                visible     : ! passwordChangeMode
-                label.text  : ""
-                label.width : 0
+                label.text  : passwordChangeMode ? qsTr("Current") : ""
+                label.width : passwordChangeMode ? _root.labelWidth : 0
                 lengthMax   : passwordLengthMax
                 nextInput   : _passwordUpdated
                 anchors {
@@ -101,9 +101,8 @@
         PasswordRequirements {id: _passwordRequirements
             anchors {
                 top         : parent.top
-                topMargin   : Variables.defaultMargin * 2
                 left        : _passwordEntries.right
-                leftMargin  : Variables.defaultMargin * 2
+                leftMargin  : Variables.defaultMargin * 3
             }
             visible         : passwordChangeMode
             height          : parent.height / 2
@@ -116,11 +115,10 @@
         property alias textInput    : _passwordEntry.textInput
         property alias nextInput    : _passwordEntry.nextInput
         property alias label        : _passwordEntry.label
-        property int   labelWidth   : 150
         property alias lengthMax    : _passwordEntry.lengthMax
 
         height      : 70
-        label.width : labelWidth
+        label.width : _root.labelWidth
 
         TextEntry { id: _passwordEntry
             clip                        : true