diff --git a/src/OptionsPopup.qml b/src/OptionsPopup.qml
index df9f504..047c15c 100644
--- a/src/OptionsPopup.qml
+++ b/src/OptionsPopup.qml
@@ -552,6 +552,13 @@ Popup {
             chkSkipFirstUse.checked = true
         }
 
+        if (imageWriter.isEmbeddedMode()) {
+            /* For some reason there is no password mask character set by default on Embedded edition */
+            var bulletCharacter = String.fromCharCode(0x2022);
+            fieldUserPassword.passwordCharacter = bulletCharacter;
+            fieldWifiPassword.passwordCharacter = bulletCharacter;
+        }
+
         initialized = true
     }