diff --git a/src/wizardview/WizardView.qml b/src/wizardview/WizardView.qml
index 7d3cf5cd..5ac0298b 100644
--- a/src/wizardview/WizardView.qml
+++ b/src/wizardview/WizardView.qml
@@ -53,6 +53,7 @@ Rectangle {
     }
 
     readonly property int layoutSpacing: 12
+    readonly property int backButtonMargins: 20
 
     property int textFontSize: 9
     property int wizardMode: WizardView.CREATE
@@ -123,7 +124,7 @@ Rectangle {
             isRdv = false
             createAccountPage.nameRegistrationUIState = UsernameLineEdit.NameRegistrationState.BLANK
         } else if (pageIndex === WizardView.WizardViewPageIndex.CREATEACCOUNTPAGE) {
-            createAccountPage.initializeOnShowUp()
+            createAccountPage.initializeOnShowUp(false)
         } else if (pageIndex === WizardView.WizardViewPageIndex.CREATESIPACCOUNTPAGE) {
             createSIPAccountPage.initializeOnShowUp()
         } else if (pageIndex === WizardView.WizardViewPageIndex.IMPORTFROMDEVICEPAGE) {
@@ -169,181 +170,230 @@ Rectangle {
         onClicked: forceActiveFocus()
     }
 
-    StackLayout {
-        id: controlPanelStackView
+    ScrollView {
+        id: wizardViewScrollView
+
+        property ScrollBar vScrollBar: ScrollBar.vertical
 
         anchors.fill: parent
 
-        currentIndex: WizardView.WizardViewPageIndex.WELCOMEPAGE
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
+        ScrollBar.vertical.policy: ScrollBar.AsNeeded
 
-        WelcomePage {
-            id: welcomePage
+        clip: true
+        contentHeight: controlPanelStackView.height
 
-            onWelcomePageRedirectPage: {
-                changePageQML(toPageIndex)
+        StackLayout {
+            id: controlPanelStackView
+
+            anchors.centerIn: parent
+
+            width: wizardViewScrollView.width
+
+            currentIndex: WizardView.WizardViewPageIndex.WELCOMEPAGE
+
+            Component.onCompleted: {
+                // avoid binding loop
+                height = Qt.binding(function (){
+                    var index = currentIndex
+                            === WizardView.WizardViewPageIndex.CREATERENDEZVOUS ?
+                                WizardView.WizardViewPageIndex.CREATEACCOUNTPAGE : currentIndex
+                    return Math.max(
+                                controlPanelStackView.itemAt(index).preferredHeight,
+                                wizardViewScrollView.height)
+                })
             }
 
-            onLeavePage: {
-                wizardViewIsClosed()
-            }
-        }
+            WelcomePage {
+                id: welcomePage
 
-        CreateAccountPage {
-            id: createAccountPage
+                Layout.alignment: Qt.AlignCenter
 
-            onCreateAccount: {
-                inputParaObject = {}
-                inputParaObject["isRendezVous"] = isRdv
-                inputParaObject["password"] = text_passwordEditAlias
-                AccountAdapter.createJamiAccount(
-                    createAccountPage.text_usernameEditAlias,
-                    inputParaObject,
-                    createAccountPage.boothImgBase64,
-                    true)
-                showBackUp = !isRdv
-                showBottom = true
-                changePageQML(WizardView.WizardViewPageIndex.PROFILEPAGE)
-            }
-
-            onLeavePage: {
-                changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
-            }
-        }
-
-        CreateSIPAccountPage {
-            id: createSIPAccountPage
-
-            onLeavePage: {
-                changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
-            }
-
-            onCreateAccount: {
-                inputParaObject = {}
-                inputParaObject["hostname"] = createSIPAccountPage.text_sipServernameEditAlias
-                inputParaObject["username"] = createSIPAccountPage.text_sipUsernameEditAlias
-                inputParaObject["password"] = createSIPAccountPage.text_sipPasswordEditAlias
-                inputParaObject["proxy"] = createSIPAccountPage.text_sipProxyEditAlias
-                createSIPAccountPage.clearAllTextFields()
-
-                AccountAdapter.createSIPAccount(inputParaObject, "")
-                showBackUp = false
-                showBottom = false
-                changePageQML(WizardView.WizardViewPageIndex.PROFILEPAGE)
-                controlPanelStackView.profilePage.readyToSaveDetails()
-            }
-        }
-
-        ImportFromBackupPage {
-            id: importFromBackupPage
-
-            onLeavePage: {
-                changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
-            }
-
-            onImportAccount: {
-                inputParaObject = {}
-                inputParaObject["archivePath"] = UtilsAdapter.getAbsPath(importFromBackupPage.filePath)
-                inputParaObject["password"] = importFromBackupPage.text_passwordFromBackupEditAlias
-                showBackUp = false
-                showBottom = false
-                showProfile = true
-                AccountAdapter.createJamiAccount(
-                    "", inputParaObject, "", false)
-            }
-        }
-
-        BackupKeyPage {
-            id: backupKeysPage
-
-            onNeverShowAgainBoxClicked: {
-                SettingsAdapter.setValue(Settings.NeverShowMeAgain, isChecked)
-            }
-
-            onExport_Btn_FileDialogAccepted: {
-                if (accepted) {
-                    // is there password? If so, go to password dialog, else, go to following directly
-                    if (AccountAdapter.hasPassword()) {
-                        passwordDialog.path = UtilsAdapter.getAbsPath(folderDir)
-                        passwordDialog.open()
-                        return
-                    } else {
-                        if (folderDir.length > 0) {
-                            AccountAdapter.exportToFile(
-                                        AccountAdapter.currentAccountId,
-                                        UtilsAdapter.getAbsPath(folderDir))
-                        }
-                    }
+                onWelcomePageRedirectPage: {
+                    changePageQML(toPageIndex)
                 }
 
-                changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
-                needToShowMainViewWindow(addedAccountIndex)
+                onLeavePage: {
+                    wizardViewIsClosed()
+                }
+
+                onScrollToBottom: {
+                    if (welcomePage.preferredHeight > root.height)
+                        wizardViewScrollView.vScrollBar.position = 1
+                }
             }
 
-            onLeavePage: {
-                changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
-                needToShowMainViewWindow(addedAccountIndex)
-            }
-        }
+            CreateAccountPage {
+                id: createAccountPage
 
-        ImportFromDevicePage {
-            id: importFromDevicePage
+                Layout.alignment: Qt.AlignCenter
 
-            onLeavePage: {
-                changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                onCreateAccount: {
+                    inputParaObject = {}
+                    inputParaObject["isRendezVous"] = isRdv
+                    inputParaObject["password"] = text_passwordEditAlias
+                    AccountAdapter.createJamiAccount(
+                        createAccountPage.text_usernameEditAlias,
+                        inputParaObject,
+                        createAccountPage.boothImgBase64,
+                        true)
+                    showBackUp = !isRdv
+                    showBottom = true
+                    changePageQML(WizardView.WizardViewPageIndex.PROFILEPAGE)
+                }
+
+                onLeavePage: {
+                    changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                }
             }
 
-            onImportAccount: {
-                inputParaObject = {}
-                inputParaObject["archivePin"] = importFromDevicePage.text_pinFromDeviceAlias
-                inputParaObject["password"] = importFromDevicePage.text_passwordFromDeviceAlias
+            CreateSIPAccountPage {
+                id: createSIPAccountPage
 
-                showProfile = true
-                showBackUp = false
-                showBottom = false
-                AccountAdapter.createJamiAccount(
-                    "", inputParaObject, "", false)
-            }
-        }
+                Layout.alignment: Qt.AlignCenter
 
-        ConnectToAccountManagerPage {
-            id: connectToAccountManagerPage
+                onLeavePage: {
+                    changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                }
 
-            onCreateAccount: {
-                inputParaObject = {}
-                inputParaObject["username"]
-                        = connectToAccountManagerPage.text_usernameManagerEditAlias
-                inputParaObject["password"]
-                        = connectToAccountManagerPage.text_passwordManagerEditAlias
-                inputParaObject["manager"]
-                        = connectToAccountManagerPage.text_accountManagerEditAlias
-                AccountAdapter.createJAMSAccount(inputParaObject)
+                onCreateAccount: {
+                    inputParaObject = {}
+                    inputParaObject["hostname"] = createSIPAccountPage.text_sipServernameEditAlias
+                    inputParaObject["username"] = createSIPAccountPage.text_sipUsernameEditAlias
+                    inputParaObject["password"] = createSIPAccountPage.text_sipPasswordEditAlias
+                    inputParaObject["proxy"] = createSIPAccountPage.text_sipProxyEditAlias
+                    createSIPAccountPage.clearAllTextFields()
+
+                    AccountAdapter.createSIPAccount(inputParaObject, "")
+                    showBackUp = false
+                    showBottom = false
+                    changePageQML(WizardView.WizardViewPageIndex.PROFILEPAGE)
+                    controlPanelStackView.profilePage.readyToSaveDetails()
+                }
             }
 
-            onLeavePage: {
-                changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+            ImportFromBackupPage {
+                id: importFromBackupPage
+
+                Layout.alignment: Qt.AlignCenter
+
+                onLeavePage: {
+                    changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                }
+
+                onImportAccount: {
+                    inputParaObject = {}
+                    inputParaObject["archivePath"] = UtilsAdapter.getAbsPath(importFromBackupPage.filePath)
+                    inputParaObject["password"] = importFromBackupPage.text_passwordFromBackupEditAlias
+                    showBackUp = false
+                    showBottom = false
+                    showProfile = true
+                    AccountAdapter.createJamiAccount(
+                        "", inputParaObject, "", false)
+                }
             }
-        }
 
-        ProfilePage {
-            id: profilePage
+            BackupKeyPage {
+                id: backupKeysPage
 
-            function leave() {
-                if (showBackUp)
-                    changePageQML(WizardView.WizardViewPageIndex.BACKUPKEYSPAGE)
-                else {
+                Layout.alignment: Qt.AlignCenter
+
+                onNeverShowAgainBoxClicked: {
+                    SettingsAdapter.setValue(Settings.NeverShowMeAgain, isChecked)
+                }
+
+                onExport_Btn_FileDialogAccepted: {
+                    if (accepted) {
+                        // is there password? If so, go to password dialog, else, go to following directly
+                        if (AccountAdapter.hasPassword()) {
+                            passwordDialog.path = UtilsAdapter.getAbsPath(folderDir)
+                            passwordDialog.open()
+                            return
+                        } else {
+                            if (folderDir.length > 0) {
+                                AccountAdapter.exportToFile(
+                                            AccountAdapter.currentAccountId,
+                                            UtilsAdapter.getAbsPath(folderDir))
+                            }
+                        }
+                    }
+
+                    changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                    needToShowMainViewWindow(addedAccountIndex)
+                }
+
+                onLeavePage: {
                     changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
                     needToShowMainViewWindow(addedAccountIndex)
                 }
             }
 
-            onSaveProfile: {
-                SettingsAdapter.setCurrAccAvatar(profilePage.boothImgBase64)
-                AccountAdapter.setCurrAccDisplayName(profilePage.displayName)
-                leave()
+            ImportFromDevicePage {
+                id: importFromDevicePage
+
+                Layout.alignment: Qt.AlignCenter
+
+                onLeavePage: {
+                    changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                }
+
+                onImportAccount: {
+                    inputParaObject = {}
+                    inputParaObject["archivePin"] = importFromDevicePage.text_pinFromDeviceAlias
+                    inputParaObject["password"] = importFromDevicePage.text_passwordFromDeviceAlias
+
+                    showProfile = true
+                    showBackUp = false
+                    showBottom = false
+                    AccountAdapter.createJamiAccount(
+                        "", inputParaObject, "", false)
+                }
             }
 
-            onLeavePage: {
-                leave()
+            ConnectToAccountManagerPage {
+                id: connectToAccountManagerPage
+
+                Layout.alignment: Qt.AlignCenter
+
+                onCreateAccount: {
+                    inputParaObject = {}
+                    inputParaObject["username"]
+                            = connectToAccountManagerPage.text_usernameManagerEditAlias
+                    inputParaObject["password"]
+                            = connectToAccountManagerPage.text_passwordManagerEditAlias
+                    inputParaObject["manager"]
+                            = connectToAccountManagerPage.text_accountManagerEditAlias
+                    AccountAdapter.createJAMSAccount(inputParaObject)
+                }
+
+                onLeavePage: {
+                    changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                }
+            }
+
+            ProfilePage {
+                id: profilePage
+
+                Layout.alignment: Qt.AlignCenter
+
+                function leave() {
+                    if (showBackUp)
+                        changePageQML(WizardView.WizardViewPageIndex.BACKUPKEYSPAGE)
+                    else {
+                        changePageQML(WizardView.WizardViewPageIndex.WELCOMEPAGE)
+                        needToShowMainViewWindow(addedAccountIndex)
+                    }
+                }
+
+                onSaveProfile: {
+                    SettingsAdapter.setCurrAccAvatar(profilePage.boothImgBase64)
+                    AccountAdapter.setCurrAccDisplayName(profilePage.displayName)
+                    leave()
+                }
+
+                onLeavePage: {
+                    leave()
+                }
             }
         }
     }
diff --git a/src/wizardview/components/BackupKeyPage.qml b/src/wizardview/components/BackupKeyPage.qml
index 80633312..f5d9ee7a 100644
--- a/src/wizardview/components/BackupKeyPage.qml
+++ b/src/wizardview/components/BackupKeyPage.qml
@@ -28,6 +28,8 @@ import "../../settingsview/components"
 Rectangle {
     id: root
 
+    property int preferredHeight: backupKeysPageColumnLayout.implicitHeight
+
     signal neverShowAgainBoxClicked(bool isChecked)
     signal leavePage
     signal export_Btn_FileDialogAccepted(bool accepted, string folderDir)
@@ -62,6 +64,8 @@ Rectangle {
     color: JamiTheme.backgroundColor
 
     ColumnLayout {
+        id: backupKeysPageColumnLayout
+
         spacing: layoutSpacing
 
         anchors.horizontalCenter: parent.horizontalCenter
@@ -71,6 +75,7 @@ Rectangle {
             spacing: layoutSpacing
 
             Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: backButtonMargins
             Layout.preferredWidth: backupBtn.width
 
             Label {
@@ -151,6 +156,7 @@ Rectangle {
 
         MaterialButton {
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: backButtonMargins
             Layout.preferredWidth: preferredWidth
             Layout.preferredHeight: preferredHeight
 
diff --git a/src/wizardview/components/ConnectToAccountManagerPage.qml b/src/wizardview/components/ConnectToAccountManagerPage.qml
index d4d8ce0f..3d7e3fc6 100644
--- a/src/wizardview/components/ConnectToAccountManagerPage.qml
+++ b/src/wizardview/components/ConnectToAccountManagerPage.qml
@@ -30,6 +30,7 @@ Rectangle {
     property alias text_passwordManagerEditAlias: passwordManagerEdit.text
     property alias text_accountManagerEditAlias: accountManagerEdit.text
     property string errorText: ""
+    property int preferredHeight: connectToAccountManagerPageColumnLayout.implicitHeight
 
     signal leavePage
     signal createAccount
@@ -59,6 +60,8 @@ Rectangle {
     }
 
     ColumnLayout {
+        id: connectToAccountManagerPageColumnLayout
+
         spacing: layoutSpacing
 
         anchors.horizontalCenter: parent.horizontalCenter
@@ -68,7 +71,8 @@ Rectangle {
             spacing: layoutSpacing
 
             Layout.alignment: Qt.AlignCenter
-            Layout.preferredWidth: connectBtn.width
+            Layout.topMargin: backButtonMargins
+            Layout.preferredWidth: implicitWidth
 
             Label {
                 text: JamiStrings.enterJAMSURL
@@ -108,10 +112,14 @@ Rectangle {
         }
 
         Label {
-            Layout.alignment: Qt.AlignLeft
+            Layout.alignment: Qt.AlignCenter
+            Layout.preferredWidth: connectBtn.width
 
             text: JamiStrings.jamsCredentials
             wrapMode: Text.Wrap
+
+            onTextChanged: Layout.preferredHeight =
+                           JamiQmlUtils.getTextBoundingRect(font, text).height
         }
 
         MaterialLineEdit {
@@ -153,6 +161,7 @@ Rectangle {
             id: connectBtn
 
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: errorLabel.visible ? 0 : backButtonMargins
             Layout.preferredWidth: preferredWidth
             Layout.preferredHeight: preferredHeight
 
@@ -171,7 +180,10 @@ Rectangle {
         }
 
         Label {
+            id: errorLabel
+
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: backButtonMargins
 
             visible: errorText.length !== 0
             text: errorText
diff --git a/src/wizardview/components/CreateAccountPage.qml b/src/wizardview/components/CreateAccountPage.qml
index b10e9177..8a673706 100644
--- a/src/wizardview/components/CreateAccountPage.qml
+++ b/src/wizardview/components/CreateAccountPage.qml
@@ -33,6 +33,11 @@ Rectangle {
     property alias nameRegistrationUIState: usernameEdit.nameRegistrationState
     property bool isRendezVous: false
     property alias text_passwordEditAlias: passwordEdit.text
+    property int preferredHeight: {
+        if (createAccountStack.currentIndex === 0)
+            return usernameColumnLayout.implicitHeight
+        return passwordColumnLayout.implicitHeight
+    }
 
     signal createAccount
     signal leavePage
@@ -94,218 +99,259 @@ Rectangle {
     StackLayout {
         id: createAccountStack
 
-        anchors.verticalCenter: root.verticalCenter
-        anchors.horizontalCenter: root.horizontalCenter
+        anchors.fill: parent
 
-        ColumnLayout {
-            spacing: layoutSpacing
+        currentIndex: 0
 
-            Layout.preferredWidth: root.width
-            Layout.alignment: Qt.AlignCenter
+        Rectangle {
+            color: JamiTheme.backgroundColor
+
+            ColumnLayout {
+                id: usernameColumnLayout
 
-            RowLayout {
                 spacing: layoutSpacing
 
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: usernameEdit.width
+                anchors.centerIn: parent
 
-                Label {
-                    text: isRendezVous ? JamiStrings.chooseNameRV : qsTr("Choose a username for your account")
-                    font.pointSize: JamiTheme.textFontSize + 3
+                width: root.width
+
+                RowLayout {
+                    spacing: layoutSpacing
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.topMargin: backButtonMargins
+                    Layout.preferredWidth: usernameEdit.width
+
+                    Label {
+                        text: isRendezVous ? JamiStrings.chooseNameRV : qsTr("Choose a username for your account")
+                        font.pointSize: JamiTheme.textFontSize + 3
+                    }
+
+                    Label {
+                        Layout.alignment: Qt.AlignRight
+
+                        text: JamiStrings.recommended
+                        color: "white"
+                        padding: 8
+
+                        background: Rectangle {
+                            color: "#aed581"
+                            radius: 24
+                            anchors.fill: parent
+                        }
+                    }
+                }
+
+                UsernameLineEdit {
+                    id: usernameEdit
+
+                    Layout.topMargin: 15
+                    Layout.preferredHeight: fieldLayoutHeight
+                    Layout.preferredWidth:  chooseUsernameButton.width
+                    Layout.alignment: Qt.AlignHCenter
+
+                    placeholderText: isRendezVous ? qsTr("Choose a name") : qsTr("Choose your username")
                 }
 
                 Label {
-                    Layout.alignment: Qt.AlignRight
+                    Layout.alignment: Qt.AlignHCenter
 
-                    text: JamiStrings.recommended
-                    color: "white"
-                    padding: 8
+                    visible: text.length !==0
 
-                    background: Rectangle {
-                        color: "#aed581"
-                        radius: 24
-                        anchors.fill: parent
+                    text: {
+                        switch(nameRegistrationUIState){
+                        case UsernameLineEdit.NameRegistrationState.BLANK:
+                        case UsernameLineEdit.NameRegistrationState.SEARCHING:
+                        case UsernameLineEdit.NameRegistrationState.FREE:
+                            return ""
+                        case UsernameLineEdit.NameRegistrationState.INVALID:
+                            return isRendezVous ? qsTr("Invalid name") : qsTr("Invalid username")
+                        case UsernameLineEdit.NameRegistrationState.TAKEN:
+                            return isRendezVous ? qsTr("Name already taken") : qsTr("Username already taken")
+                        }
+                    }
+                    font.pointSize: JamiTheme.textFontSize
+                    color: "red"
+                }
+
+                MaterialButton {
+                    id: chooseUsernameButton
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.preferredWidth: preferredWidth
+                    Layout.preferredHeight: preferredHeight
+
+                    fontCapitalization: Font.AllUppercase
+                    text: isRendezVous ? JamiStrings.chooseName : JamiStrings.chooseUsername
+                    enabled: nameRegistrationUIState === UsernameLineEdit.NameRegistrationState.FREE
+                    color: nameRegistrationUIState === UsernameLineEdit.NameRegistrationState.FREE ?
+                               JamiTheme.wizardBlueButtons :
+                               JamiTheme.buttonTintedGreyInactive
+                    hoveredColor: JamiTheme.buttonTintedBlueHovered
+                    pressedColor: JamiTheme.buttonTintedBluePressed
+
+                    onClicked: {
+                        if (nameRegistrationUIState === UsernameLineEdit.NameRegistrationState.FREE)
+                            createAccountStack.currentIndex = createAccountStack.currentIndex + 1
                     }
                 }
-            }
 
-            UsernameLineEdit {
-                id: usernameEdit
+                MaterialButton {
+                    id: skipButton
 
-                Layout.topMargin: 15
-                Layout.preferredHeight: fieldLayoutHeight
-                Layout.preferredWidth:  chooseUsernameButton.width
-                Layout.alignment: Qt.AlignHCenter
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.preferredWidth: preferredWidth
+                    Layout.preferredHeight: preferredHeight
 
-                placeholderText: isRendezVous ? qsTr("Choose a name") : qsTr("Choose your username")
-            }
+                    text: JamiStrings.skip
+                    color: JamiTheme.buttonTintedGrey
+                    hoveredColor: JamiTheme.buttonTintedGreyHovered
+                    pressedColor: JamiTheme.buttonTintedGreyPressed
+                    outlined: true
 
-            Label {
-                Layout.alignment: Qt.AlignHCenter
-
-                visible: text.length !==0
-
-                text: {
-                    switch(nameRegistrationUIState){
-                    case UsernameLineEdit.NameRegistrationState.BLANK:
-                    case UsernameLineEdit.NameRegistrationState.SEARCHING:
-                    case UsernameLineEdit.NameRegistrationState.FREE:
-                        return ""
-                    case UsernameLineEdit.NameRegistrationState.INVALID:
-                        return isRendezVous ? qsTr("Invalid name") : qsTr("Invalid username")
-                    case UsernameLineEdit.NameRegistrationState.TAKEN:
-                        return isRendezVous ? qsTr("Name already taken") : qsTr("Username already taken")
-                    }
+                    onClicked: createAccountStack.currentIndex =
+                               createAccountStack.currentIndex + 1
                 }
-                font.pointSize: JamiTheme.textFontSize
-                color: "red"
-            }
 
-            MaterialButton {
-                id: chooseUsernameButton
+                AccountCreationStepIndicator {
+                    Layout.topMargin: backButtonMargins
+                    Layout.bottomMargin: backButtonMargins
+                    Layout.alignment: Qt.AlignHCenter
 
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: preferredWidth
-                Layout.preferredHeight: preferredHeight
-
-                fontCapitalization: Font.AllUppercase
-                text: isRendezVous ? JamiStrings.chooseName : JamiStrings.chooseUsername
-                enabled: nameRegistrationUIState === UsernameLineEdit.NameRegistrationState.FREE
-                color: nameRegistrationUIState === UsernameLineEdit.NameRegistrationState.FREE ?
-                           JamiTheme.wizardBlueButtons :
-                           JamiTheme.buttonTintedGreyInactive
-                hoveredColor: JamiTheme.buttonTintedBlueHovered
-                pressedColor: JamiTheme.buttonTintedBluePressed
-
-                onClicked: {
-                    if (nameRegistrationUIState === UsernameLineEdit.NameRegistrationState.FREE)
-                        createAccountStack.currentIndex = createAccountStack.currentIndex + 1
+                    spacing: layoutSpacing
+                    steps: 3
+                    currentStep: 1
                 }
             }
-
-            MaterialButton {
-                id: skipButton
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: preferredWidth
-                Layout.preferredHeight: preferredHeight
-
-                text: JamiStrings.skip
-                color: JamiTheme.buttonTintedGrey
-                hoveredColor: JamiTheme.buttonTintedGreyHovered
-                pressedColor: JamiTheme.buttonTintedGreyPressed
-                outlined: true
-
-                onClicked: createAccountStack.currentIndex =
-                           createAccountStack.currentIndex + 1
-            }
         }
 
-        ColumnLayout {
-            spacing: layoutSpacing
+        Rectangle {
+            color: JamiTheme.backgroundColor
 
-            Layout.preferredWidth: root.width
-            Layout.alignment: Qt.AlignCenter
+            ColumnLayout {
+                id: passwordColumnLayout
 
-            RowLayout {
                 spacing: layoutSpacing
 
-                Layout.alignment: Qt.AlignCenter
-                Layout.preferredWidth: usernameEdit.width
+                anchors.centerIn: parent
+                width: root.width
 
-                Label {
-                    text: JamiStrings.createPassword
-                    font.pointSize: JamiTheme.textFontSize + 3
+                RowLayout {
+                    spacing: layoutSpacing
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.topMargin: backButtonMargins
+                    Layout.preferredWidth: usernameEdit.width
+
+                    Label {
+                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                        text: JamiStrings.createPassword
+                        font.pointSize: JamiTheme.textFontSize + 3
+                    }
 
                     Switch {
                         id: passwordSwitch
 
-                        anchors.left: parent.right
-                        anchors.verticalCenter: parent.verticalCenter
+                        Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
+                        Layout.leftMargin:  -layoutSpacing
+                        Layout.topMargin: 5
                     }
+
+                    Label {
+                        Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
+
+                        text: JamiStrings.optional
+                        color: "white"
+                        padding: 8
+
+                        background: Rectangle {
+                            color: "#28b1ed"
+                            radius: 24
+                            anchors.fill: parent
+                        }
+                    }
+                }
+
+                MaterialLineEdit {
+                    id: passwordEdit
+
+                    Layout.preferredHeight: fieldLayoutHeight
+                    Layout.preferredWidth: createAccountButton.width
+                    Layout.alignment: Qt.AlignHCenter
+
+                    visible: passwordSwitch.checked
+
+                    selectByMouse: true
+                    echoMode: TextInput.Password
+                    placeholderText: JamiStrings.password
+                    font.pointSize: 9
+                    font.kerning: true
+                }
+
+                MaterialLineEdit {
+                    id: passwordConfirmEdit
+
+                    Layout.preferredHeight: fieldLayoutHeight
+                    Layout.preferredWidth: createAccountButton.width
+                    Layout.alignment: Qt.AlignHCenter
+
+                    visible: passwordSwitch.checked
+
+                    selectByMouse: true
+                    echoMode: TextInput.Password
+                    placeholderText: JamiStrings.confirmPassword
+                    font.pointSize: 9
+                    font.kerning: true
                 }
 
                 Label {
-                    Layout.alignment: Qt.AlignRight
+                    Layout.alignment: Qt.AlignLeft
+                    Layout.preferredWidth: createAccountButton.width - 10
+                    Layout.leftMargin: (root.width - createAccountButton.width) / 2
 
-                    text: JamiStrings.optional
-                    color: "white"
-                    padding: 8
+                    text: JamiStrings.notePasswordRecovery
+                    wrapMode: Text.WordWrap
+                    font.pointSize: JamiTheme.textFontSize
 
-                    background: Rectangle {
-                        color: "#28b1ed"
-                        radius: 24
-                        anchors.fill: parent
+                    onFontChanged: Layout.preferredHeight =
+                                   JamiQmlUtils.getTextBoundingRect(font, text).height * 2
+                }
+
+                MaterialButton {
+                    id: createAccountButton
+
+                    Layout.alignment: Qt.AlignCenter
+                    Layout.preferredWidth: preferredWidth
+                    Layout.preferredHeight: preferredHeight
+
+                    function checkEnable() {
+                        return !passwordSwitch.checked ||
+                                (passwordEdit.text === passwordConfirmEdit.text
+                                 && passwordEdit.text.length !== 0)
+                    }
+
+                    fontCapitalization: Font.AllUppercase
+                    text: isRendezVous ? JamiStrings.createRV : JamiStrings.createAccount
+                    enabled: checkEnable()
+                    color: checkEnable() ? JamiTheme.wizardBlueButtons :
+                                           JamiTheme.buttonTintedGreyInactive
+                    hoveredColor: JamiTheme.buttonTintedBlueHovered
+                    pressedColor: JamiTheme.buttonTintedBluePressed
+
+                    onClicked: {
+                        createAccount()
+                        createAccountStack.currentIndex += 1
                     }
                 }
-            }
 
-            MaterialLineEdit {
-                id: passwordEdit
+                AccountCreationStepIndicator {
+                    Layout.topMargin: backButtonMargins
+                    Layout.bottomMargin: backButtonMargins
+                    Layout.alignment: Qt.AlignHCenter
 
-                Layout.preferredHeight: fieldLayoutHeight
-                Layout.preferredWidth: createAccountButton.width
-                Layout.alignment: Qt.AlignHCenter
-
-                visible: passwordSwitch.checked
-
-                selectByMouse: true
-                echoMode: TextInput.Password
-                placeholderText: JamiStrings.password
-                font.pointSize: 9
-                font.kerning: true
-            }
-
-            MaterialLineEdit {
-                id: passwordConfirmEdit
-
-                Layout.preferredHeight: fieldLayoutHeight
-                Layout.preferredWidth: createAccountButton.width
-                Layout.alignment: Qt.AlignHCenter
-
-                visible: passwordSwitch.checked
-
-                selectByMouse: true
-                echoMode: TextInput.Password
-                placeholderText: JamiStrings.confirmPassword
-                font.pointSize: 9
-                font.kerning: true
-            }
-
-            Label {
-                Layout.alignment: Qt.AlignLeft
-                Layout.topMargin: 10
-                Layout.leftMargin: (root.width - createAccountButton.width) / 2
-
-                text: JamiStrings.notePasswordRecovery
-                font.pointSize: JamiTheme.textFontSize
-            }
-
-            MaterialButton {
-                id: createAccountButton
-
-                Layout.alignment: Qt.AlignCenter
-                Layout.topMargin: 10
-                Layout.preferredWidth: preferredWidth
-                Layout.preferredHeight: preferredHeight
-
-                function checkEnable() {
-                    return !passwordSwitch.checked ||
-                            (passwordEdit.text === passwordConfirmEdit.text
-                             && passwordEdit.text.length !== 0)
-                }
-
-                fontCapitalization: Font.AllUppercase
-                text: isRendezVous ? JamiStrings.createRV : JamiStrings.createAccount
-                enabled: checkEnable()
-                color: checkEnable() ? JamiTheme.wizardBlueButtons :
-                                       JamiTheme.buttonTintedGreyInactive
-                hoveredColor: JamiTheme.buttonTintedBlueHovered
-                pressedColor: JamiTheme.buttonTintedBluePressed
-
-                onClicked: {
-                    createAccount()
-                    createAccountStack.currentIndex += 1
+                    spacing: layoutSpacing
+                    steps: 3
+                    currentStep: 2
                 }
             }
         }
@@ -316,7 +362,7 @@ Rectangle {
 
         anchors.left: parent.left
         anchors.top: parent.top
-        anchors.margins: 20
+        anchors.margins: backButtonMargins
 
         width: 35
         height: 35
@@ -336,14 +382,4 @@ Rectangle {
                 createAccountStack.currentIndex -= 1
         }
     }
-
-    AccountCreationStepIndicator {
-        anchors.bottom: root.bottom
-        anchors.bottomMargin: 30
-        anchors.horizontalCenter: root.horizontalCenter
-
-        spacing: layoutSpacing
-        steps: 3
-        currentStep: usernameEdit.visible ? 1 : 2
-    }
 }
diff --git a/src/wizardview/components/CreateSIPAccountPage.qml b/src/wizardview/components/CreateSIPAccountPage.qml
index 0ad21be6..1ee25d95 100644
--- a/src/wizardview/components/CreateSIPAccountPage.qml
+++ b/src/wizardview/components/CreateSIPAccountPage.qml
@@ -30,6 +30,7 @@ Rectangle {
     property alias text_sipProxyEditAlias: sipProxyEdit.text
     property alias text_sipUsernameEditAlias: sipUsernameEdit.text
     property alias text_sipPasswordEditAlias: sipPasswordEdit.text
+    property int preferredHeight: createSIPAccountPageColumnLayout.implicitHeight
 
     property var boothImgBase64: null
 
@@ -56,6 +57,8 @@ Rectangle {
     }
 
     ColumnLayout {
+        id: createSIPAccountPageColumnLayout
+
         spacing: layoutSpacing
 
         anchors.centerIn: parent
@@ -64,6 +67,7 @@ Rectangle {
             spacing: layoutSpacing
 
             Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: backButtonMargins
             Layout.preferredWidth: createAccountButton.width
 
             Label {
@@ -143,6 +147,7 @@ Rectangle {
             id: createAccountButton
 
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: backButtonMargins
             Layout.preferredWidth: preferredWidth
             Layout.preferredHeight: preferredHeight
 
diff --git a/src/wizardview/components/ImportFromBackupPage.qml b/src/wizardview/components/ImportFromBackupPage.qml
index 787a3c3e..2edc0303 100644
--- a/src/wizardview/components/ImportFromBackupPage.qml
+++ b/src/wizardview/components/ImportFromBackupPage.qml
@@ -31,6 +31,7 @@ Rectangle {
 
     property alias text_passwordFromBackupEditAlias: passwordFromBackupEdit.text
     property string fileImportBtnText: JamiStrings.archive
+    property int preferredHeight: importFromBackupPageColumnLayout.implicitHeight
 
     property string filePath: ""
     property string errorText: ""
@@ -72,6 +73,8 @@ Rectangle {
     }
 
     ColumnLayout {
+        id: importFromBackupPageColumnLayout
+
         spacing: layoutSpacing
 
         anchors.horizontalCenter: parent.horizontalCenter
@@ -79,6 +82,7 @@ Rectangle {
 
         Text {
             Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: backButtonMargins
 
             text: qsTr("Import from backup")
             font.pointSize: JamiTheme.menuFontSize
@@ -145,6 +149,7 @@ Rectangle {
             id: connectBtn
 
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: errorLabel.visible ? 0 : backButtonMargins
             Layout.preferredWidth: preferredWidth
             Layout.preferredHeight: preferredHeight
 
@@ -166,7 +171,10 @@ Rectangle {
         }
 
         Label {
+            id: errorLabel
+
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: backButtonMargins
 
             visible: errorText.length !== 0
 
diff --git a/src/wizardview/components/ImportFromDevicePage.qml b/src/wizardview/components/ImportFromDevicePage.qml
index dd42208f..afcddc2b 100644
--- a/src/wizardview/components/ImportFromDevicePage.qml
+++ b/src/wizardview/components/ImportFromDevicePage.qml
@@ -29,6 +29,7 @@ Rectangle {
     property alias text_pinFromDeviceAlias: pinFromDevice.text
     property alias text_passwordFromDeviceAlias: passwordFromDevice.text
     property string errorText: ""
+    property int preferredHeight: importFromDevicePageColumnLayout.implicitHeight
 
     signal leavePage
     signal importAccount
@@ -56,6 +57,8 @@ Rectangle {
     }
 
     ColumnLayout {
+        id: importFromDevicePageColumnLayout
+
         spacing: layoutSpacing
 
         // Prevent possible anchor loop detected on centerIn.
@@ -64,6 +67,7 @@ Rectangle {
 
         Text {
             Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: backButtonMargins
 
             text: JamiStrings.mainAccountPassword
             font.pointSize: JamiTheme.menuFontSize
@@ -125,6 +129,7 @@ Rectangle {
             id: connectBtn
 
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: errorLabel.visible ? 0 : backButtonMargins
             Layout.preferredWidth: preferredWidth
             Layout.preferredHeight: preferredHeight
 
@@ -140,7 +145,10 @@ Rectangle {
         }
 
         Label {
+            id: errorLabel
+
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: backButtonMargins
 
             visible: errorText.length !== 0
 
diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml
index 2f9dc543..4f092844 100644
--- a/src/wizardview/components/ProfilePage.qml
+++ b/src/wizardview/components/ProfilePage.qml
@@ -26,6 +26,8 @@ import "../../commoncomponents"
 Rectangle {
     id: root
 
+    property int preferredHeight: profilePageColumnLayout.implicitHeight
+
     function initializeOnShowUp() {
         clearAllTextFields()
         boothImgBase64 = ""
@@ -51,6 +53,8 @@ Rectangle {
     property bool isRdv: false
 
     ColumnLayout {
+        id: profilePageColumnLayout
+
         spacing: layoutSpacing
 
         width: parent.width
@@ -60,6 +64,7 @@ Rectangle {
         RowLayout {
             spacing: layoutSpacing
 
+            Layout.topMargin: backButtonMargins
             Layout.preferredWidth: saveProfileBtn.width
             Layout.alignment: Qt.AlignCenter
 
@@ -139,15 +144,15 @@ Rectangle {
                 leavePage()
             }
         }
-    }
 
-    AccountCreationStepIndicator {
-        anchors.bottom: root.bottom
-        anchors.bottomMargin: 30
-        anchors.horizontalCenter: root.horizontalCenter
+        AccountCreationStepIndicator {
+            Layout.topMargin: backButtonMargins
+            Layout.bottomMargin: backButtonMargins
+            Layout.alignment: Qt.AlignHCenter
 
-        spacing: layoutSpacing
-        steps: 3
-        currentStep: 3
+            spacing: layoutSpacing
+            steps: 3
+            currentStep: 3
+        }
     }
 }
diff --git a/src/wizardview/components/WelcomePage.qml b/src/wizardview/components/WelcomePage.qml
index 00d59719..1debe547 100644
--- a/src/wizardview/components/WelcomePage.qml
+++ b/src/wizardview/components/WelcomePage.qml
@@ -30,12 +30,17 @@ import "../../commoncomponents"
 Rectangle {
     id: root
 
+    property int preferredHeight: welcomePageColumnLayout.implicitHeight
+
     signal welcomePageRedirectPage(int toPageIndex)
     signal leavePage
+    signal scrollToBottom
 
     color: JamiTheme.backgroundColor
 
     ColumnLayout {
+        id: welcomePageColumnLayout
+
         anchors.centerIn: parent
 
         spacing: layoutSpacing
@@ -44,6 +49,7 @@ Rectangle {
             id: welcomeLabel
 
             Layout.alignment: Qt.AlignCenter
+            Layout.topMargin: backButtonMargins
             Layout.preferredHeight: contentHeight
 
             text: qsTr("Welcome to")
@@ -154,6 +160,7 @@ Rectangle {
             id: showAdvancedButton
 
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: newSIPAccountButton.visible ? 0 : backButtonMargins
             Layout.preferredWidth: preferredWidth
             Layout.preferredHeight: preferredHeight
 
@@ -203,6 +210,7 @@ Rectangle {
             id: newSIPAccountButton
 
             Layout.alignment: Qt.AlignCenter
+            Layout.bottomMargin: backButtonMargins
             Layout.preferredWidth: preferredWidth
             Layout.preferredHeight: preferredHeight
 
@@ -220,6 +228,8 @@ Rectangle {
                 welcomePageRedirectPage(2)
             }
         }
+
+        onHeightChanged: scrollToBottom()
     }
 
     HoverableButton {
@@ -227,7 +237,7 @@ Rectangle {
 
         anchors.left: parent.left
         anchors.top: parent.top
-        anchors.margins: 20
+        anchors.margins: backButtonMargins
 
         Connections {
             target: LRCInstance