diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index df8cd1c7a49868a4de7c6f39957c0f6e79776e2d..4726aabf23c457e17d4f9dc253717746044c9826 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -250,8 +250,8 @@ vlc_module_begin ()
                 true )
     add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
                 true )
-    add_string( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
-                PASSWORD_LONGTEXT, true )
+    add_password( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
+                  PASSWORD_LONGTEXT, true )
     add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT,
                 true )
     add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT,
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index b3dc2c911bb1a7aa9a1438c121d03c7ac9641a84..b2d692d19229577fb6af848efefdecb2a6024d6b 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -79,8 +79,8 @@ vlc_module_begin ()
         change_safe()
     add_string( "ftp-user", "anonymous", NULL, USER_TEXT, USER_LONGTEXT,
                 false )
-    add_string( "ftp-pwd", "anonymous@example.com", NULL, PASS_TEXT,
-                PASS_LONGTEXT, false )
+    add_password( "ftp-pwd", "anonymous@example.com", NULL, PASS_TEXT,
+                  PASS_LONGTEXT, false )
     add_string( "ftp-account", "anonymous", NULL, ACCOUNT_TEXT,
                 ACCOUNT_LONGTEXT, false )
     add_shortcut( "ftp" )
diff --git a/modules/access/smb.c b/modules/access/smb.c
index 3a572e2eadd3b6460fc0d3e1892d2892b2339de5..5d735f011c7ff952392b1bf05ca86cb639ae463e 100644
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -86,8 +86,8 @@ vlc_module_begin ()
         change_safe()
     add_string( "smb-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
                 false )
-    add_string( "smb-pwd", NULL, NULL, PASS_TEXT,
-                PASS_LONGTEXT, false )
+    add_password( "smb-pwd", NULL, NULL, PASS_TEXT,
+                  PASS_LONGTEXT, false )
     add_string( "smb-domain", NULL, NULL, DOMAIN_TEXT,
                 DOMAIN_LONGTEXT, false )
     add_shortcut( "smb" )
diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 6e713e5018cb967618c06e6bd3312be91af4d14c..10e07dcd096bce4aa4b301054eea1a63197d2745 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -102,8 +102,8 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_SOUT_ACO )
     add_string( SOUT_CFG_PREFIX "user", "", NULL,
                 USER_TEXT, USER_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "pwd", "", NULL,
-                PASS_TEXT, PASS_LONGTEXT, true )
+    add_password( SOUT_CFG_PREFIX "pwd", "", NULL,
+                  PASS_TEXT, PASS_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "mime", "", NULL,
                 MIME_TEXT, MIME_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL,
diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 99fc633fd0450ac10ddc3d04acbf6198ccf02639..ae1dd9bc469930d9486875390f8601baa93ae72f 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -134,8 +134,8 @@ vlc_module_begin ()
                     KASENNA_LONGTEXT, true )
         add_string( "rtsp-user", NULL, NULL, USER_TEXT,
                     USER_LONGTEXT, true )
-        add_string( "rtsp-pwd", NULL, NULL, PASS_TEXT,
-                    PASS_LONGTEXT, true )
+        add_password( "rtsp-pwd", NULL, NULL, PASS_TEXT,
+                      PASS_LONGTEXT, true )
 vlc_module_end ()