diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 7d121152bb..27f5adb748 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -128,6 +128,9 @@ class accounts_backend
 		{
 			if ($to_write['account_id'] < 0) $to_write['account_id'] *= -1;
 
+			if (!isset($to_write['account_pwd'])) $to_write['account_pwd'] = '';	// is NOT NULL!
+			if (!isset($to_write['account_status'])) $to_write['account_status'] = '';	// is NOT NULL!
+
 			if (!in_array($to_write['account_type'],array('u','g')) ||
 				!$this->db->insert($this->table,$to_write,false,__LINE__,__FILE__)) return false;