diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 228c9318300aef67fc0f626d578f7e4bfde6a3f9..050ad4ed9c89c380ad479c49fbff651f95be67c6 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -487,7 +487,7 @@ CREATE TABLE `server` (
   `updated` tinyint(4) NOT NULL default '0',
   `active` tinyint(4) NOT NULL default '1',
   PRIMARY KEY  (`server_id`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+) ENGINE=MyISAM  DEFAULT CHARSET=latin1;
 
 -- 
 -- Daten für Tabelle `server`
diff --git a/interface/lib/classes/tform.inc.php b/interface/lib/classes/tform.inc.php
index c0028c07c7c6471cd9c62ab5de4952a4c62d7db0..251a9f91c24e3641a5629c5675c005ba63d490af 100644
--- a/interface/lib/classes/tform.inc.php
+++ b/interface/lib/classes/tform.inc.php
@@ -693,7 +693,7 @@ class tform {
                                                         $sql_insert_key .= "`$key`, ";
                                                         if($field['encryption'] == 'CRYPT') {
                                                                 $salt="$1$";
-																for ($n=0;$n<8;$n++) {
+																for ($n=0;$n<11;$n++) {
 																	$salt.=chr(mt_rand(64,126));
 																}
 																$salt.="$";
@@ -702,7 +702,7 @@ class tform {
                                                         } else {
                                                                 $record[$key] = md5($record[$key]);
                                                         }
-														$sql_insert_val .= "'".$record[$key]."', ";
+														$sql_insert_val .= "'".addslashes($record[$key])."', ";
                                                 } elseif ($field['formtype'] == 'CHECKBOX') {
                                                         $sql_insert_key .= "`$key`, ";
 														if($record[$key] == '') {
@@ -720,7 +720,7 @@ class tform {
                                                 if($field['formtype'] == 'PASSWORD') {
 														if(isset($field['encryption']) && $field['encryption'] == 'CRYPT') {
                                                                 $salt="$1$";
-																for ($n=0;$n<8;$n++) {
+																for ($n=0;$n<11;$n++) {
 																	$salt.=chr(mt_rand(64,126));
 																}
 																$salt.="$";
@@ -729,7 +729,7 @@ class tform {
                                                         } else {
                                                                 $record[$key] = md5($record[$key]);
                                                         }
-                                                        $sql_update .= "`$key` = '".$record[$key]."', ";
+                                                        $sql_update .= "`$key` = '".addslashes($record[$key])."', ";
                                                 } elseif ($field['formtype'] == 'CHECKBOX') {
 														if($record[$key] == '') {
 															// if a checkbox is not set, we set it to the unchecked value