Merge branch 'fixed_6823' into 'develop'

Fixed #6823

Closes #6823

See merge request ispconfig/ispconfig3!1978

Author: Till Brehm

interface/web/client/client_edit.php

@@ -468,13 +468,13 @@ function onAfterUpdate() {
 		}
 
 		// lock and cancel
-        if(!isset($this->dataRecord['locked'])) $this->dataRecord['locked'] = 'n';
+        if(!isset($this->dataRecord['locked']) && isset($this->dataRecord['username'])) $this->dataRecord['locked'] = 'n';
         if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["locked"] != $this->oldDataRecord['locked'])
 		{
 			$lock = $app->functions->func_client_lock($this->id,$this->dataRecord["locked"]);
         }
 
-		if(!isset($this->dataRecord['canceled'])) $this->dataRecord['canceled'] = 'n';
+		if(!isset($this->dataRecord['canceled']) && isset($this->dataRecord['username'])) $this->dataRecord['canceled'] = 'n';
 		if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["canceled"] != $this->oldDataRecord['canceled']) {
 			$cancel = $app->functions->func_client_cancel($this->id,$this->dataRecord["canceled"]);
 		}