diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index edff8ab9e..4284a59b8 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -356,18 +356,20 @@ function local_user_set(&$user, $force_password = false, $userattrs = null)
     // XXX: primary group id can only be wheel or nobody, otherwise we should map the correct numbers for comparison
     $user_gid = $user_group == 'wheel' ? 0 : 65534;
 
-    /* passwords only when integrated auth is disabled or forced */
-    if (!$force_password && empty($config['system']['disableintegratedauth'])) {
-        $user_pass = '*';
-    }
+    if (!$force_password) {
+        /* passwords only when integrated auth is disabled or forced */
+        if (empty($config['system']['disableintegratedauth'])) {
+            $user_pass = '*';
+        }
 
-    /* read from pw db if not provided (batch mode) */
-    if ($userattrs === null) {
-        $fd = popen("/usr/sbin/pw usershow -n {$user_name}", 'r');
-        $pwread = fgets($fd);
-        pclose($fd);
-        if (substr_count($pwread, ':')) {
-            $userattrs = explode(':', trim($pwread));
+        /* read from pw db if not provided (batch mode) */
+        if ($userattrs === null) {
+            $fd = popen("/usr/sbin/pw usershow -n {$user_name}", 'r');
+            $pwread = fgets($fd);
+            pclose($fd);
+            if (substr_count($pwread, ':')) {
+                $userattrs = explode(':', trim($pwread));
+            }
         }
     }