diff --git a/src/app/commoncomponents/EditableLineEdit.qml b/src/app/commoncomponents/EditableLineEdit.qml
index 8daab3375e93fabba38c81570ab136808dc116a7..5bcca2eb77d23eb05b3b64421c9eb637a1a2da3e 100644
--- a/src/app/commoncomponents/EditableLineEdit.qml
+++ b/src/app/commoncomponents/EditableLineEdit.qml
@@ -53,7 +53,7 @@ Item {
     property alias verticalAlignment: lineEdit.verticalAlignment
     property alias horizontalAlignment: lineEdit.horizontalAlignment
     property alias font: lineEdit.font
-    property var placeholderText
+    property var placeholderText: ""
     property alias placeholderTextColor: lineEdit.placeholderTextColor
     property alias backgroundColor: lineEdit.backgroundColor
     property var editIconColor: "transparent"
diff --git a/src/app/commoncomponents/UsernameLineEdit.qml b/src/app/commoncomponents/UsernameLineEdit.qml
index 1db84f0eeb84ef45766192fe9ae30070a242e429..f2553c2d7b31a3b55e993a102f68b2246213639c 100644
--- a/src/app/commoncomponents/UsernameLineEdit.qml
+++ b/src/app/commoncomponents/UsernameLineEdit.qml
@@ -25,8 +25,7 @@ import net.jami.Constants 1.1
 EditableLineEdit {
     id: root
 
-    placeholderText: isRendezVous ? JamiStrings.chooseAName :
-                                    JamiStrings.chooseYourUserName
+    placeholderText: JamiStrings.chooseYourUserName
 
     firstIco: readOnly? "" : JamiResources.person_24dp_svg
     firstIcoColor: "#03B9E9"
diff --git a/src/app/mainview/components/ContactPickerItemDelegate.qml b/src/app/mainview/components/ContactPickerItemDelegate.qml
index 778a0c1ee7cc1d241942c525bca1de338229fa48..f538be6914dedfeb4a7339d332e482a7fc0c5fc4 100644
--- a/src/app/mainview/components/ContactPickerItemDelegate.qml
+++ b/src/app/mainview/components/ContactPickerItemDelegate.qml
@@ -81,6 +81,7 @@ ItemDelegate {
 
             color: JamiTheme.textColor
             text: textMetricsContactPickerContactName.elidedText
+            textFormat: TextEdit.PlainText
             font.pointSize: JamiTheme.textFontSize
         }
 
@@ -102,6 +103,7 @@ ItemDelegate {
             }
 
             text: textMetricsContactPickerContactId.elidedText
+            textFormat: TextEdit.PlainText
             font.pointSize: JamiTheme.textFontSize
         }
     }
diff --git a/src/app/mainview/components/WelcomePage.qml b/src/app/mainview/components/WelcomePage.qml
index 7eb6df4078fe0689f09302979e234f3364e25937..97e3887f84f2bd9256335e97fbbdc22c0f9e233a 100644
--- a/src/app/mainview/components/WelcomePage.qml
+++ b/src/app/mainview/components/WelcomePage.qml
@@ -98,7 +98,7 @@ Rectangle {
 
                     Label {
                         id: identifierDescription
-                        
+
                         anchors.top: welcome.bottom
                         anchors.left: parent.left
                         anchors.topMargin: JamiTheme.preferredMarginSize
@@ -116,7 +116,7 @@ Rectangle {
                     JamiIdentifier {
                         id: identifier
                         editable: true
-                        
+
                         anchors.top: identifierDescription.bottom
                         anchors.left: parent.left
                         anchors.margins: JamiTheme.preferredMarginSize
@@ -157,7 +157,7 @@ Rectangle {
 
                     Flow {
                         id: flow
-                        spacing: 12
+                        spacing: 13
 
                         Repeater {
                             model: TipsModel
diff --git a/src/app/wizardview/components/CreateAccountPage.qml b/src/app/wizardview/components/CreateAccountPage.qml
index 30f3b5e9604d0134b70900611e44236707de4005..c79dfa584ac511837e95af3d93a1f2e9e5ed79f2 100644
--- a/src/app/wizardview/components/CreateAccountPage.qml
+++ b/src/app/wizardview/components/CreateAccountPage.qml
@@ -134,6 +134,8 @@ Rectangle {
                     Layout.topMargin: 15
                     Layout.alignment: Qt.AlignHCenter
                     Layout.preferredWidth: Math.min(440, root.width - JamiTheme.preferredMarginSize * 2)
+                    placeholderText: isRendezVous ? JamiStrings.chooseAName :
+                                    JamiStrings.chooseYourUserName
 
                     focus: visible
                     fontSize: 18