diff --git a/src/app/commoncomponents/MaterialTextField.qml b/src/app/commoncomponents/MaterialTextField.qml
index 776cf632..6581b520 100644
--- a/src/app/commoncomponents/MaterialTextField.qml
+++ b/src/app/commoncomponents/MaterialTextField.qml
@@ -187,7 +187,7 @@ TextField {
         width: suffixIcon.width
         height: suffixIcon.height
         anchors.right: suffixBisIcon.left
-        anchors.rightMargin: suffixBisIconSrc !== '' ? 5 : 0
+        anchors.rightMargin: suffixBisIconSrc !== '' ? 5 : root.isActive ? 0 : 20
         anchors.verticalCenter: root.verticalCenter
         anchors.verticalCenterOffset: -root.bottomPadding / 2
         visible: !readOnly
diff --git a/src/app/wizardview/components/CreateAccountPage.qml b/src/app/wizardview/components/CreateAccountPage.qml
index 3fdab432..7874f6ad 100644
--- a/src/app/wizardview/components/CreateAccountPage.qml
+++ b/src/app/wizardview/components/CreateAccountPage.qml
@@ -244,6 +244,7 @@ Rectangle {
                     id: invalidLabel
 
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
+                    Layout.topMargin: JamiTheme.wizardViewDescriptionMarginSize
                     visible: text.length !==0
                     Layout.preferredWidth: Math.min(440, root.width - JamiTheme.preferredMarginSize * 2)