diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index 2e21140f..0d1a2ac4 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -1034,10 +1034,17 @@ class posixAccount extends baseModule {
 				// TODO autoGID
 				$partialAccounts[$i]['uidNumber'] = 42;
 			}
-			elseif (get_preg($rawAccounts[$i][$ids['posixAccount_uid']], 'digit') &&
-			($rawAccounts[$i][$ids['posixAccount_uid']] > $this->moduleSettings['posixAccount_minUID'][0]) &&
-			($rawAccounts[$i][$ids['posixAccount_uid']] < $this->moduleSettings['posixAccount_maxUID'][0])) {
-				$partialAccounts[$i]['uidNumber'] = $rawAccounts[$i][$ids['posixAccount_uid']];
+			elseif (get_preg($rawAccounts[$i][$ids['posixAccount_uid']], 'digit')) {
+				if (($this->get_scope() == 'user') &&
+				($rawAccounts[$i][$ids['posixAccount_uid']] > $this->moduleSettings['posixAccount_minUID'][0]) &&
+				($rawAccounts[$i][$ids['posixAccount_uid']] < $this->moduleSettings['posixAccount_maxUID'][0])) {
+					$partialAccounts[$i]['uidNumber'] = $rawAccounts[$i][$ids['posixAccount_uid']];
+				}
+				elseif (($this->get_scope() == 'host') &&
+				($rawAccounts[$i][$ids['posixAccount_uid']] > $this->moduleSettings['posixAccount_minMachine'][0]) &&
+				($rawAccounts[$i][$ids['posixAccount_uid']] < $this->moduleSettings['posixAccount_maxMachine'][0])) {
+					$partialAccounts[$i]['uidNumber'] = $rawAccounts[$i][$ids['posixAccount_uid']];
+				}
 			}
 			else {
 				$errMsg = $this->messages['uidNumber'][4];