diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index d4d299e39..96b14c365 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -146,13 +146,12 @@ CreateUserJob::exec()
         }
     }
 
-    int ec = CalamaresUtils::System::instance()->
-             targetEnvCall( { "useradd",
-                              "-m",
-                              "-U",
-                              "-c",
-                              m_fullName,
-                              m_userName } );
+    QStringList useradd{ "useradd", "-m", "-U" };
+    // TODO: shell-settings
+    useradd << "-c" << m_fullName;
+    useradd << m_userName;
+
+    int ec = CalamaresUtils::System::instance()->targetEnvCall( useradd );
     if ( ec )
         return Calamares::JobResult::error( tr( "Cannot create user %1." )
                                                 .arg( m_userName ),