diff --git a/src/includes/functions.inc.php b/src/includes/functions.inc.php
index 67381113..33bfcb8c 100644
--- a/src/includes/functions.inc.php
+++ b/src/includes/functions.inc.php
@@ -624,16 +624,15 @@ function psm_no_cache() {
 /**
  * Encrypts the password for storage in the database
  *
+ * @param string $key
  * @param string $password
  * @return string
  * @author Pavel Laupe Dvorak <pavel@pavel-dvorak.cz>
  */
-function psm_password_encrypt($password)
+function psm_password_encrypt($key, $password)
 {
-	if(empty($password))
-		return '';
-
-	$key = psm_get_conf('password_encrypt_key');
+	if (empty($password)) return '';
+	if (empty($key)) return '';
 
 	$iv = mcrypt_create_iv(
 		mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC),
@@ -657,16 +656,15 @@ function psm_password_encrypt($password)
 /**
  * Decrypts password stored in the database for future use
  *
+ * @param string $key
  * @param string $encryptedString
  * @return string
  * @author Pavel Laupe Dvorak <pavel@pavel-dvorak.cz>
  */
-function psm_password_decrypt($encryptedString)
+function psm_password_decrypt($key, $encryptedString)
 {
-	if(empty($encryptedString))
-		return '';
-
-	$key = psm_get_conf('password_encrypt_key');
+	if (empty($encryptedString)) return '';
+	if (empty($key)) return '';
 
 	$data = base64_decode($encryptedString);
 	$iv = substr($data, 0, mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
diff --git a/src/lang/cs_CZ.lang.php b/src/lang/cs_CZ.lang.php
index 3485d0e2..09049038 100644
--- a/src/lang/cs_CZ.lang.php
+++ b/src/lang/cs_CZ.lang.php
@@ -126,7 +126,7 @@ $sm_lang = array(
 		'website_username' => 'Uživatelské jméno',
 		'website_username_description' => 'Uživatelské jméno pro přístup na stránku. (Pouze Apache autorizace je podporovaná.)',
 		'website_password' => 'Heslo',
-		'website_password_description' => 'Heslo pro přístup na stránku. Heslo je v databázi šifrované a NENÍ uloženo v čistém textu.',
+		'website_password_description' => 'Heslo pro přístup na stránku. Heslo je v databázi šifrované.',
 		'fieldset_monitoring' => 'Monitoring',
 		'fieldset_permissions' => 'Oprávnění',
 		'port' => 'Port',
diff --git a/src/psm/Module/Server/Controller/ServerController.php b/src/psm/Module/Server/Controller/ServerController.php
index 20d82fbd..267ae0b6 100644
--- a/src/psm/Module/Server/Controller/ServerController.php
+++ b/src/psm/Module/Server/Controller/ServerController.php
@@ -229,42 +229,37 @@ class ServerController extends AbstractServerController {
 	 * Executes the saving of one of the servers
 	 */
 	protected function executeSave() {
-		if(empty($_POST)) {
+		if (empty($_POST)) {
 			// dont process anything if no data has been posted
 			return $this->executeIndex();
 		}
 
          $encrypted_password  = '';
 
-         if(!empty($_POST['website_password']))
-         {
-             $new_password = psm_POST('website_password');
-             if($this->server_id > 0)
-             {
-                 $edit_server = $this->getServers($this->server_id);
-                 $hash = sha1($edit_server['website_password']);
+		if (!empty($_POST['website_password'])) {
+			$new_password = psm_POST('website_password');
 
-                 if($new_password == $hash)
-                 {
-                     $encrypted_password = $edit_server['website_password'];
-                 }
-                 else
-                 {
-                     $encrypted_password =  psm_password_encrypt( $new_password);
-                 }
-             }
-             else
-             {
-                 $encrypted_password =  psm_password_encrypt($new_password);
-             }
-         }
+			if ($this->server_id > 0) {
+				$edit_server = $this->getServers($this->server_id);
+				$hash = sha1($edit_server['website_password']);
+
+				if ($new_password == $hash) {
+					$encrypted_password = $edit_server['website_password'];
+				} else {
+					$encrypted_password = psm_password_encrypt($this->server_id . psm_get_conf('password_encrypt_key'), $new_password);
+				}
+			} else {
+				// if server_id=0 necessary after adding to encrypt again
+				$encrypted_password = psm_password_encrypt('0' . psm_get_conf('password_encrypt_key'), $new_password);
+			}
+		}
 
 		$clean = array(
 			'label' => trim(strip_tags(psm_POST('label', ''))),
 			'ip' => trim(strip_tags(psm_POST('ip', ''))),
 			'timeout' => (isset($_POST['timeout']) && intval($_POST['timeout']) > 0) ? intval($_POST['timeout']) : null,
 			'website_username' => psm_POST('website_username', null),
-               'website_password' => $encrypted_password,
+			'website_password' => $encrypted_password,
 			'port' => intval(psm_POST('port', 0)),
 			'type' => psm_POST('type', ''),
 			'pattern' => psm_POST('pattern', ''),
@@ -308,6 +303,23 @@ class ServerController extends AbstractServerController {
 			// add
 			$clean['status'] = 'on';
 			$this->server_id = $this->db->save(PSM_DB_PREFIX.'servers', $clean);
+
+			// server has been added, re-encrypt
+			if (!empty($_POST['website_password'])) {
+				$cleanWebsitePassword = array(
+					'website_password' => psm_password_encrypt(
+						$this->server_id . psm_get_conf('password_encrypt_key'),
+						psm_POST('website_password')
+					),
+				);
+
+				$this->db->save(
+					PSM_DB_PREFIX . 'servers',
+					$cleanWebsitePassword,
+					array('server_id' => $this->server_id)
+				);
+			}
+
 			$this->addMessage(psm_get_lang('servers', 'inserted'), 'success');
 		}
 
diff --git a/src/psm/Util/Server/Updater/StatusUpdater.php b/src/psm/Util/Server/Updater/StatusUpdater.php
index a8aed70d..0ff33a69 100644
--- a/src/psm/Util/Server/Updater/StatusUpdater.php
+++ b/src/psm/Util/Server/Updater/StatusUpdater.php
@@ -180,7 +180,7 @@ class StatusUpdater {
 			$this->server['timeout'],
 			true,
 			$this->server['website_username'],
-			psm_password_decrypt($this->server['website_password'])
+			psm_password_decrypt($this->server['server_id'] . psm_get_conf('password_encrypt_key'), $this->server['website_password'])
 		);
 
 		$this->rtime = (microtime(true) - $starttime);