diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 1f4ebd949ea27664770926cb94ecfa03ef7085b5..dc25cc8bb5a7fbe644298bb39b4bcaec4e86c4e2 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -136,9 +136,11 @@ class app {
       }
 	  
 	  function tpl_defaults() {
+		global $conf;
 		
 		$this->tpl->setVar('theme',$_SESSION["s"]["theme"]);
 		$this->tpl->setVar('phpsessid',session_id());
+		$this->tpl->setVar('html_content_encoding',$conf["html_content_encoding"]);
 	  	
 	  }
 
diff --git a/interface/lib/classes/tform_tpl_generator.inc.php b/interface/lib/classes/tform_tpl_generator.inc.php
index a9d35ee1eb9634ccc13a8efa68dbce7b2cf12eca..1a78288eb8dcd303c1bcb665c02a4604f073bdd8 100644
--- a/interface/lib/classes/tform_tpl_generator.inc.php
+++ b/interface/lib/classes/tform_tpl_generator.inc.php
@@ -153,7 +153,7 @@ class tform_tpl_generator {
 		// ansonsten wird sie angelegt
 		$tables = $app->db->getTables();
 		
-		if(!in_array($formDef['db_table'],$tables)) {
+		if(!@in_array($formDef['db_table'],$tables)) {
 			// Datenbank noch nicht vorhanden
 			
 			$columns = array();
@@ -172,6 +172,52 @@ class tform_tpl_generator {
 			$columns[] = $col;
 			$app->db->show_error_messages = true;
 			
+			if($formDef["auth"] == 'yes') {
+				
+				$col = array(	'action' 		=> 'add',
+								'name'			=> 'sys_userid',
+								'type'			=> 'int32',
+								'typeValue'		=> '',
+								'defaultValue'	=> '',
+								'notNull'		=> true
+							);
+				$columns[] = $col;
+				$col = array(	'action' 		=> 'add',
+								'name'			=> 'sys_groupid',
+								'type'			=> 'int32',
+								'typeValue'		=> '',
+								'defaultValue'	=> '',
+								'notNull'		=> true
+							);
+				$columns[] = $col;
+				$col = array(	'action' 		=> 'add',
+								'name'			=> 'sys_perm_user',
+								'type'			=> 'varchar',
+								'typeValue'		=> '5',
+								'defaultValue'	=> '',
+								'notNull'		=> true
+							);
+				$columns[] = $col;
+				$col = array(	'action' 		=> 'add',
+								'name'			=> 'sys_perm_group',
+								'type'			=> 'varchar',
+								'typeValue'		=> '5',
+								'defaultValue'	=> '',
+								'notNull'		=> true
+							);
+				$columns[] = $col;
+				$col = array(	'action' 		=> 'add',
+								'name'			=> 'sys_perm_other',
+								'type'			=> 'varchar',
+								'typeValue'		=> '5',
+								'defaultValue'	=> '',
+								'notNull'		=> true
+							);
+				$columns[] = $col;
+			
+			}
+			
+			
 			foreach($formDef['tabs'] as $tab) {
 				foreach($tab["fields"] as $name => $field) {
 					/*
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 91153a82d05ee3d5b6235b172540a2225b6ef8fe..0fe510c221fe8b39e17815ba87417378f78370c6 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -62,7 +62,8 @@ $conf["programs"]["wput"]			= $conf["rootpath"]."\\tools\\wput\\wput.exe";
 	Themes
 */
 
-$conf["theme"] 			= 'default';
+$conf["theme"] 					= 'default';
+$conf["html_content_encoding"]	= 'text/html; charset=iso-8859-1';
 
 /*
 	Default Language
diff --git a/interface/sql/ispconfig3db.sql b/interface/sql/ispconfig3db.sql
index 33dd406e77a7b996140842adbb0cad1d08357bc5..887ce2ea4e34ca71eb154f27df4601441a5bee46 100644
--- a/interface/sql/ispconfig3db.sql
+++ b/interface/sql/ispconfig3db.sql
@@ -3,151 +3,12 @@
 # http://www.phpmyadmin.net/ (download page)
 #
 # Host: localhost
-# Erstellungszeit: 18. Oktober 2005 um 16:00
-# Server Version: 4.0.22
-# PHP-Version: 5.0.2
+# Erstellungszeit: 01. November 2005 um 23:57
+# Server Version: 4.0.23
+# PHP-Version: 5.0.3
 # Datenbank: `ispconfig3`
 # --------------------------------------------------------
 
-#
-# Tabellenstruktur für Tabelle `sys_datalog`
-#
-
-DROP TABLE IF EXISTS sys_datalog;
-CREATE TABLE sys_datalog (
-  datalog_id bigint(20) NOT NULL auto_increment,
-  dbtable varchar(255) NOT NULL default '',
-  dbidx varchar(255) NOT NULL default '',
-  action char(1) NOT NULL default '',
-  tstamp bigint(20) NOT NULL default '0',
-  user varchar(255) NOT NULL default '',
-  data text NOT NULL,
-  PRIMARY KEY  (datalog_id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_datalog`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_dbsync`
-#
-
-DROP TABLE IF EXISTS sys_dbsync;
-CREATE TABLE sys_dbsync (
-  id bigint(20) NOT NULL auto_increment,
-  jobname varchar(255) NOT NULL default '',
-  sync_interval_minutes int(11) NOT NULL default '0',
-  db_type varchar(255) NOT NULL default '',
-  db_host varchar(255) NOT NULL default '',
-  db_name varchar(255) NOT NULL default '',
-  db_username varchar(255) NOT NULL default '',
-  db_password varchar(255) NOT NULL default '',
-  db_tables varchar(255) NOT NULL default 'admin,forms',
-  empty_datalog int(11) NOT NULL default '0',
-  sync_datalog_external int(11) NOT NULL default '0',
-  active int(11) NOT NULL default '1',
-  last_datalog_id bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (id),
-  KEY last_datalog_id (last_datalog_id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_dbsync`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_filesync`
-#
-
-DROP TABLE IF EXISTS sys_filesync;
-CREATE TABLE sys_filesync (
-  id bigint(20) NOT NULL auto_increment,
-  jobname varchar(255) NOT NULL default '',
-  sync_interval_minutes int(11) NOT NULL default '0',
-  ftp_host varchar(255) NOT NULL default '',
-  ftp_path varchar(255) NOT NULL default '',
-  ftp_username varchar(255) NOT NULL default '',
-  ftp_password varchar(255) NOT NULL default '',
-  local_path varchar(255) NOT NULL default '',
-  wput_options varchar(255) NOT NULL default '--timestamping --reupload --dont-continue',
-  active int(11) NOT NULL default '1',
-  PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_filesync`
-#
-
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_group`
-#
-
-DROP TABLE IF EXISTS sys_group;
-CREATE TABLE sys_group (
-  groupid int(11) NOT NULL auto_increment,
-  name varchar(255) NOT NULL default '',
-  description text NOT NULL,
-  PRIMARY KEY  (groupid)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_group`
-#
-
-INSERT INTO sys_group VALUES (1, 'admin', 'Administrators group');
-INSERT INTO sys_group VALUES (2, 'user', 'Users Group');
-# --------------------------------------------------------
-
-#
-# Tabellenstruktur für Tabelle `sys_user`
-#
-
-DROP TABLE IF EXISTS sys_user;
-CREATE TABLE sys_user (
-  userid int(11) NOT NULL auto_increment,
-  sys_userid int(11) NOT NULL default '0',
-  sys_groupid int(11) NOT NULL default '0',
-  sys_perm_user varchar(5) NOT NULL default '',
-  sys_perm_group varchar(5) NOT NULL default '',
-  sys_perm_other varchar(5) NOT NULL default '',
-  username varchar(100) NOT NULL default '',
-  passwort varchar(100) NOT NULL default '',
-  modules varchar(255) NOT NULL default '',
-  startmodule varchar(255) NOT NULL default '',
-  app_theme varchar(100) NOT NULL default 'default',
-  typ varchar(20) NOT NULL default 'user',
-  active tinyint(4) NOT NULL default '1',
-  name varchar(100) NOT NULL default '',
-  vorname varchar(100) NOT NULL default '',
-  unternehmen varchar(100) NOT NULL default '',
-  strasse varchar(100) NOT NULL default '',
-  ort varchar(100) NOT NULL default '',
-  plz varchar(10) NOT NULL default '',
-  land varchar(50) NOT NULL default '',
-  email varchar(100) NOT NULL default '',
-  url varchar(255) NOT NULL default '',
-  telefon varchar(100) NOT NULL default '',
-  fax varchar(100) NOT NULL default '',
-  language varchar(10) NOT NULL default 'de',
-  groups varchar(255) NOT NULL default '',
-  default_group int(11) NOT NULL default '0',
-  PRIMARY KEY  (userid)
-) TYPE=MyISAM;
-
-#
-# Daten für Tabelle `sys_user`
-#
-
-INSERT INTO sys_user VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,clients,designer,resellers,sites', 'admin', 'default', 'admin', 1, '', 'Administrator', '', '', '', '', '', '', '', '', '', 'en', '1,2', 0);
-
-
 #
 # Tabellenstruktur für Tabelle `mail_blacklist`
 #
@@ -160,6 +21,11 @@ CREATE TABLE mail_blacklist (
   PRIMARY KEY  (blacklist_id),
   KEY server_id (server_id,address)
 ) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `mail_blacklist`
+#
+
 # --------------------------------------------------------
 
 #
@@ -176,6 +42,11 @@ CREATE TABLE mail_domain (
   PRIMARY KEY  (domain_id),
   KEY server_id (server_id,domain,type)
 ) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `mail_domain`
+#
+
 # --------------------------------------------------------
 
 #
@@ -191,6 +62,11 @@ CREATE TABLE mail_domain_alias (
   PRIMARY KEY  (domain_alias_id),
   KEY server_id (server_id,domain)
 ) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `mail_domain_alias`
+#
+
 # --------------------------------------------------------
 
 #
@@ -206,6 +82,11 @@ CREATE TABLE mail_domain_catchall (
   PRIMARY KEY  (virtual_default_id),
   KEY server_id (server_id,domain)
 ) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `mail_domain_catchall`
+#
+
 # --------------------------------------------------------
 
 #
@@ -236,6 +117,11 @@ CREATE TABLE mail_email (
   PRIMARY KEY  (mailbox_id),
   KEY server_id (server_id,email)
 ) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `mail_email`
+#
+
 # --------------------------------------------------------
 
 #
@@ -253,6 +139,11 @@ CREATE TABLE mail_greylist (
   create_time datetime NOT NULL default '0000-00-00 00:00:00',
   PRIMARY KEY  (greylist_id)
 ) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `mail_greylist`
+#
+
 # --------------------------------------------------------
 
 #
@@ -270,6 +161,11 @@ CREATE TABLE mail_mailman_domain (
   mm_group varchar(50) NOT NULL default '',
   PRIMARY KEY  (mailman_id,server_id,domain)
 ) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `mail_mailman_domain`
+#
+
 # --------------------------------------------------------
 
 #
@@ -285,10 +181,17 @@ CREATE TABLE mail_whitelist (
   KEY server_id (server_id,address)
 ) TYPE=MyISAM;
 
+#
+# Daten für Tabelle `mail_whitelist`
+#
+
+# --------------------------------------------------------
+
 #
 # Tabellenstruktur für Tabelle `reseller`
 #
 
+DROP TABLE IF EXISTS reseller;
 CREATE TABLE reseller (
   reseller_id bigint(20) NOT NULL auto_increment,
   sys_userid int(11) NOT NULL default '0',
@@ -322,4 +225,179 @@ CREATE TABLE reseller (
   ip_address text NOT NULL,
   PRIMARY KEY  (reseller_id)
 ) TYPE=MyISAM;
-# --------------------------------------------------------
\ No newline at end of file
+
+#
+# Daten für Tabelle `reseller`
+#
+
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur für Tabelle `server`
+#
+
+DROP TABLE IF EXISTS server;
+CREATE TABLE server (
+  server_id bigint(20) NOT NULL auto_increment,
+  sys_userid int(11) NOT NULL default '0',
+  sys_groupid int(11) NOT NULL default '0',
+  sys_perm_user varchar(5) NOT NULL default '',
+  sys_perm_group varchar(5) NOT NULL default '',
+  sys_perm_other varchar(5) NOT NULL default '',
+  server_name varchar(255) NOT NULL default '',
+  mail_server int(11) NOT NULL default '0',
+  web_server int(11) NOT NULL default '0',
+  dns_server int(11) NOT NULL default '0',
+  file_server int(11) NOT NULL default '0',
+  mysql_server int(11) NOT NULL default '0',
+  postgresql_server int(11) NOT NULL default '0',
+  firebird_server int(11) NOT NULL default '0',
+  active int(11) NOT NULL default '1',
+  PRIMARY KEY  (server_id)
+) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `server`
+#
+
+INSERT INTO server VALUES (1, 1, 1, 'riud', 'riud', '', 'Server 1', 1, 0, 0, 0, 0, 0, 0, 1);
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur für Tabelle `sys_datalog`
+#
+
+DROP TABLE IF EXISTS sys_datalog;
+CREATE TABLE sys_datalog (
+  datalog_id bigint(20) NOT NULL auto_increment,
+  dbtable varchar(255) NOT NULL default '',
+  dbidx varchar(255) NOT NULL default '',
+  action char(1) NOT NULL default '',
+  tstamp bigint(20) NOT NULL default '0',
+  user varchar(255) NOT NULL default '',
+  data text NOT NULL,
+  PRIMARY KEY  (datalog_id)
+) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `sys_datalog`
+#
+
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur für Tabelle `sys_dbsync`
+#
+
+DROP TABLE IF EXISTS sys_dbsync;
+CREATE TABLE sys_dbsync (
+  id bigint(20) NOT NULL auto_increment,
+  jobname varchar(255) NOT NULL default '',
+  sync_interval_minutes int(11) NOT NULL default '0',
+  db_type varchar(255) NOT NULL default '',
+  db_host varchar(255) NOT NULL default '',
+  db_name varchar(255) NOT NULL default '',
+  db_username varchar(255) NOT NULL default '',
+  db_password varchar(255) NOT NULL default '',
+  db_tables varchar(255) NOT NULL default 'admin,forms',
+  empty_datalog int(11) NOT NULL default '0',
+  sync_datalog_external int(11) NOT NULL default '0',
+  active int(11) NOT NULL default '1',
+  last_datalog_id bigint(20) NOT NULL default '0',
+  PRIMARY KEY  (id),
+  KEY last_datalog_id (last_datalog_id)
+) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `sys_dbsync`
+#
+
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur für Tabelle `sys_filesync`
+#
+
+DROP TABLE IF EXISTS sys_filesync;
+CREATE TABLE sys_filesync (
+  id bigint(20) NOT NULL auto_increment,
+  jobname varchar(255) NOT NULL default '',
+  sync_interval_minutes int(11) NOT NULL default '0',
+  ftp_host varchar(255) NOT NULL default '',
+  ftp_path varchar(255) NOT NULL default '',
+  ftp_username varchar(255) NOT NULL default '',
+  ftp_password varchar(255) NOT NULL default '',
+  local_path varchar(255) NOT NULL default '',
+  wput_options varchar(255) NOT NULL default '--timestamping --reupload --dont-continue',
+  active int(11) NOT NULL default '1',
+  PRIMARY KEY  (id)
+) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `sys_filesync`
+#
+
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur für Tabelle `sys_group`
+#
+
+DROP TABLE IF EXISTS sys_group;
+CREATE TABLE sys_group (
+  groupid int(11) NOT NULL auto_increment,
+  name varchar(255) NOT NULL default '',
+  description text NOT NULL,
+  PRIMARY KEY  (groupid)
+) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `sys_group`
+#
+
+INSERT INTO sys_group VALUES (1, 'admin', 'Administrators group');
+INSERT INTO sys_group VALUES (2, 'user', 'Users Group');
+# --------------------------------------------------------
+
+#
+# Tabellenstruktur für Tabelle `sys_user`
+#
+
+DROP TABLE IF EXISTS sys_user;
+CREATE TABLE sys_user (
+  userid int(11) NOT NULL auto_increment,
+  sys_userid int(11) NOT NULL default '0',
+  sys_groupid int(11) NOT NULL default '0',
+  sys_perm_user varchar(5) NOT NULL default '',
+  sys_perm_group varchar(5) NOT NULL default '',
+  sys_perm_other varchar(5) NOT NULL default '',
+  username varchar(100) NOT NULL default '',
+  passwort varchar(100) NOT NULL default '',
+  modules varchar(255) NOT NULL default '',
+  startmodule varchar(255) NOT NULL default '',
+  app_theme varchar(100) NOT NULL default 'default',
+  typ varchar(20) NOT NULL default 'user',
+  active tinyint(4) NOT NULL default '1',
+  name varchar(100) NOT NULL default '',
+  vorname varchar(100) NOT NULL default '',
+  unternehmen varchar(100) NOT NULL default '',
+  strasse varchar(100) NOT NULL default '',
+  ort varchar(100) NOT NULL default '',
+  plz varchar(10) NOT NULL default '',
+  land varchar(50) NOT NULL default '',
+  email varchar(100) NOT NULL default '',
+  url varchar(255) NOT NULL default '',
+  telefon varchar(100) NOT NULL default '',
+  fax varchar(100) NOT NULL default '',
+  language varchar(10) NOT NULL default 'de',
+  groups varchar(255) NOT NULL default '',
+  default_group int(11) NOT NULL default '0',
+  PRIMARY KEY  (userid)
+) TYPE=MyISAM;
+
+#
+# Daten für Tabelle `sys_user`
+#
+
+INSERT INTO sys_user VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,clients,designer,resellers,sites', 'admin', 'default', 'admin', 1, '', 'Administrator', '', '', '', '', '', '', '', '', '', 'en', '1,2', 0);
+
diff --git a/interface/web/admin/form/server.tform.php b/interface/web/admin/form/server.tform.php
new file mode 100644
index 0000000000000000000000000000000000000000..95759ae0ac0e5278bed867c85854a4dabb849b9d
--- /dev/null
+++ b/interface/web/admin/form/server.tform.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+	Form Definition
+
+	Tabledefinition
+
+	Datatypes:
+	- INTEGER (Forces the input to Int)
+	- DOUBLE
+	- CURRENCY (Formats the values to currency notation)
+	- VARCHAR (no format check, maxlength: 255)
+	- TEXT (no format check)
+	- DATE (Dateformat, automatic conversion to timestamps)
+
+	Formtype:
+	- TEXT (Textfield)
+	- TEXTAREA (Textarea)
+	- PASSWORD (Password textfield, input is not shown when edited)
+	- SELECT (Select option field)
+	- RADIO
+	- CHECKBOX
+	- CHECKBOXARRAY
+	- FILE
+
+	VALUE:
+	- Wert oder Array
+
+	Hint:
+	The ID field of the database table is not part of the datafield definition.
+	The ID field must be always auto incement (int or bigint).
+
+
+*/
+
+$form["title"] 			= "Server";
+$form["description"] 	= "";
+$form["name"] 			= "server";
+$form["action"]			= "server_edit.php";
+$form["db_table"]		= "server";
+$form["db_table_idx"]	= "server_id";
+$form["db_history"]		= "no";
+$form["tab_default"]	= "services";
+$form["list_default"]	= "server_list.php";
+$form["auth"]			= 'yes';
+
+$form["auth_preset"]["userid"]  = 0; // 0 = id of the user, > 0 id must match with id of current user
+$form["auth_preset"]["groupid"] = 1; // 0 = default groupid of the user, > 0 id must match with groupid of current user
+$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
+$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
+$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
+
+$form["tabs"]['services'] = array (
+	'title' 	=> "Services",
+	'width' 	=> 100,
+	'template' 	=> "templates/server_edit_services.htm",
+	'fields' 	=> array (
+	##################################
+	# Begin Datatable fields
+	##################################
+		'server_name' => array (
+			'datatype'	=> 'VARCHAR',
+			'formtype'	=> 'TEXT',
+			'default'	=> '',
+			'value'		=> '',
+			'width'		=> '30',
+			'maxlength'	=> '255'
+		),
+		'mail_server' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> '1'
+		),
+		'web_server' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> '1'
+		),
+		'dns_server' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> '1'
+		),
+		'file_server' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> '1'
+		),
+		'mysql_server' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> '1'
+		),
+		'postgresql_server' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> '1'
+		),
+		'firebird_server' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'CHECKBOX',
+			'default'	=> '0',
+			'value'		=> '1'
+		),
+		'active' => array (
+			'datatype'	=> 'INTEGER',
+			'formtype'	=> 'SELECT',
+			'default'	=> '1',
+			'value'		=> array(0 => 'No', 1 => 'Yes')
+		),
+	##################################
+	# ENDE Datatable fields
+	##################################
+	)
+);
+
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/lang/en_server.lng b/interface/web/admin/lib/lang/en_server.lng
new file mode 100644
index 0000000000000000000000000000000000000000..a83a900a9d4e6fd01d3e8275602a159736577a56
--- /dev/null
+++ b/interface/web/admin/lib/lang/en_server.lng
@@ -0,0 +1,13 @@
+<?php
+$wb["server_name_txt"] = 'Servername';
+$wb["mail_server_txt"] = 'Mailserver';
+$wb["web_server_txt"] = 'Webserver';
+$wb["dns_server_txt"] = 'DNS-Server';
+$wb["file_server_txt"] = 'Fileserver';
+$wb["mysql_server_txt"] = 'MySQL-Server';
+$wb["postgresql_server_txt"] = 'PostgreSQL-Server';
+$wb["firebird_server_txt"] = 'Firebird-Server';
+$wb["active_txt"] = 'Active';
+$wb["btn_save_txt"] = 'Save';
+$wb["btn_cancel_txt"] = 'Cancel';
+?>
\ No newline at end of file
diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 7ee168ecdcfd4340a6d41b2588025cfd94a27d14..d1261e489305d924d85609a23c3ce7f0d0fc1e59 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -1,103 +1,120 @@
-<?php
-
-$module["name"] 		= "admin";
-$module["title"] 		= "System";
-$module["template"] 	= "module.tpl.htm";
-$module["startpage"] 	= "admin/users_list.php";
-$module["tab_width"]    = '60';
-
-
-$items[] = array( 'title' 	=> "Add user",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/users_edit.php');
-
-$items[] = array( 'title' 	=> "Edit user",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/users_list.php');
-
-				  
-$module["nav"][] = array(	'title'	=> 'Users',
-							'open' 	=> 1,
-							'items'	=> $items);
-
-
-// aufräumen
-unset($items);
-
-$items[] = array( 'title' 	=> "Add group",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/groups_edit.php');
-
-$items[] = array( 'title' 	=> "Edit group",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/groups_list.php');
-
-				  
-$module["nav"][] = array(	'title'	=> 'Groups',
-							'open' 	=> 1,
-							'items'	=> $items);
-
-
-// aufräumen
-unset($items);
-
-$items[] = array( 'title' 	=> "Add user",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/dbsync_edit.php');
-
-$items[] = array( 'title' 	=> "Edit user",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/dbsync_list.php');
-
-				  
-$items[] = array( 'title' 	=> "Sync. Now",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/dbsync_cron.php');
-
-$module["nav"][] = array(	'title'	=> 'DB Sync.',
-							'open' 	=> 1,
-							'items'	=> $items);
-
-
-// aufräumen
-unset($items);
-
-$items[] = array( 'title' 	=> "Add user",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/filesync_edit.php');
-
-$items[] = array( 'title' 	=> "Edit user",
-				  'target' 	=> 'content',
-				  'link'	=> 'admin/filesync_list.php');
-
-				  
-$module["nav"][] = array(	'title'	=> 'File Sync.',
-							'open' 	=> 1,
-							'items'	=> $items);
-
-
-// aufräumen
-unset($items);
-
-
-
-// Getting the admin options from other modules
-$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
-if(is_array($modules)) {
-	foreach($modules as $mt) {
-		if(is_file($mt."/lib/admin.conf.php")) {
-			$options = array();
-			include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
-			if(is_array($options)) {
-				foreach($options as $opt) {
-					$module["nav"][] = $opt;
-				}
-			}
-		}
-	}
-}
-
-
-
-
+<?php
+
+$module["name"] 		= "admin";
+$module["title"] 		= "System";
+$module["template"] 	= "module.tpl.htm";
+$module["startpage"] 	= "admin/users_list.php";
+$module["tab_width"]    = '60';
+
+
+$items[] = array( 'title' 	=> "Add user",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/users_edit.php');
+
+$items[] = array( 'title' 	=> "Edit user",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/users_list.php');
+
+				  
+$module["nav"][] = array(	'title'	=> 'Users',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+
+// aufräumen
+unset($items);
+
+$items[] = array( 'title' 	=> "Add group",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/groups_edit.php');
+
+$items[] = array( 'title' 	=> "Edit group",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/groups_list.php');
+
+				  
+$module["nav"][] = array(	'title'	=> 'Groups',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+
+// aufräumen
+unset($items);
+
+$items[] = array( 'title' 	=> "Add server",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/server_edit.php');
+
+$items[] = array( 'title' 	=> "Edit server",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/server_list.php');
+
+				  
+$module["nav"][] = array(	'title'	=> 'Servers',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+
+// aufräumen
+unset($items);
+
+$items[] = array( 'title' 	=> "Add user",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/dbsync_edit.php');
+
+$items[] = array( 'title' 	=> "Edit user",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/dbsync_list.php');
+
+				  
+$items[] = array( 'title' 	=> "Sync. Now",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/dbsync_cron.php');
+
+$module["nav"][] = array(	'title'	=> 'DB Sync.',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+
+// aufräumen
+unset($items);
+
+$items[] = array( 'title' 	=> "Add user",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/filesync_edit.php');
+
+$items[] = array( 'title' 	=> "Edit user",
+				  'target' 	=> 'content',
+				  'link'	=> 'admin/filesync_list.php');
+
+				  
+$module["nav"][] = array(	'title'	=> 'File Sync.',
+							'open' 	=> 1,
+							'items'	=> $items);
+
+
+// aufräumen
+unset($items);
+
+
+
+// Getting the admin options from other modules
+$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
+if(is_array($modules)) {
+	foreach($modules as $mt) {
+		if(is_file($mt."/lib/admin.conf.php")) {
+			$options = array();
+			include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
+			if(is_array($options)) {
+				foreach($options as $opt) {
+					$module["nav"][] = $opt;
+				}
+			}
+		}
+	}
+}
+
+
+
+
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/server_edit.php b/interface/web/admin/server_edit.php
new file mode 100644
index 0000000000000000000000000000000000000000..d02dc2242eed7dfc1afe94193898642d64e3e09c
--- /dev/null
+++ b/interface/web/admin/server_edit.php
@@ -0,0 +1,56 @@
+<?php
+/*
+Copyright (c) 2005, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+/******************************************
+* Begin Form configuration
+******************************************/
+
+$tform_def_file = "form/server.tform.php";
+
+/******************************************
+* End Form configuration
+******************************************/
+
+require_once('../../lib/config.inc.php');
+require_once('../../lib/app.inc.php');
+
+// Checking module permissions
+if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"])) {
+	header("Location: ../index.php");
+	exit;
+}
+
+// Loading classes
+$app->uses('tpl,tform,tform_actions');
+
+// let tform_actions handle the page
+$app->tform_actions->onLoad();
+
+?>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_edit_services.htm b/interface/web/admin/templates/server_edit_services.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0bfd7017896bfd4b5f99f54c4a62bb66458eea71
--- /dev/null
+++ b/interface/web/admin/templates/server_edit_services.htm
@@ -0,0 +1,60 @@
+<table width="500" border="0" cellspacing="0" cellpadding="2">
+  <tr>
+    <td width="100" class="frmText11">{tmpl_var name='server_name_txt'}:</td>
+    <td class="frmText11"><input name="server_name" type="text" class="text" value="{tmpl_var name='server_name'}" size="15" maxlength="255"></td>
+  </tr>
+  <tr><td colspan="2">&nbsp;</td></tr>
+  <tr><td colspan="2">
+  <fieldset style="width:205px;"><legend class="frmText11"><b>Services</b></legend>
+  <table border="0" cellspacing="0" cellpadding="2">
+  <tr>
+    <td class="frmText11">{tmpl_var name='mail_server'}</td>
+    <td class="frmText11">{tmpl_var name='mail_server_txt'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='web_server'}</td>
+    <td class="frmText11">{tmpl_var name='web_server_txt'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='dns_server'}</td>
+    <td class="frmText11">{tmpl_var name='dns_server_txt'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='file_server'}</td>
+    <td class="frmText11">{tmpl_var name='file_server_txt'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='mysql_server'}</td>
+    <td class="frmText11">{tmpl_var name='mysql_server_txt'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='postgresql_server'}</td>
+    <td class="frmText11">{tmpl_var name='postgresql_server_txt'}</td>
+  </tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='firebird_server'}</td>
+    <td class="frmText11">{tmpl_var name='firebird_server_txt'}</td>
+  </tr>
+  </table>
+  </fieldset>
+  </td></tr>
+  <tr><td colspan="2">&nbsp;</td></tr>
+  <tr>
+    <td class="frmText11">{tmpl_var name='active_txt'}:</td>
+    <td class="frmText11">
+		<select name="active" class="text">
+			{tmpl_var name='active'}
+		</select>
+	</td>
+  </tr>  <tr>
+    <td class="frmText11">&nbsp;</td>
+    <td class="frmText11">&nbsp;</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td><input name="btn_save" type="submit" class="button" value="{tmpl_var name='btn_save_txt'}">
+      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="self.location.href='server_list.php';">
+    </td>
+  </tr>
+</table>
+<input type="hidden" name="id" value="{tmpl_var name='id'}">
\ No newline at end of file
diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php
index 1a91e047af125ee6ca510bdf8e8a6dec37651e36..9f2fb8dff2efbce633d8108db908541145072ae2 100644
--- a/interface/web/sites/lib/module.conf.php
+++ b/interface/web/sites/lib/module.conf.php
@@ -1,10 +1,11 @@
 <?php
 $module = array (
   'name' => 'sites',
-  'title' => 'Sites',
+  'title' => 'Sites & Email',
   'template' => 'module.tpl.htm',
   'navframe_page' => '',
   'startpage' => 'sites/index.php',
   'tab_width' => '',
+  'nav' => NULL,
 )
 ?>
\ No newline at end of file
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 874ff1ba4f9be1c473368fba895c526b7df35f8e..b57e866eadc3a561f9843a60a00ff51a2dc16b5f 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<title>Scrigo</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>ISPConfig</title>
+<meta http-equiv="Content-Type" content="{tmpl_var name='html_content_encoding'}">
 <link href="themes/{tmpl_var name="theme"}/style.css" rel="stylesheet" type="text/css">
 <script language= "JavaScript">
 function breakout()