diff --git a/lib/formfields/customer/formfield.mysql.php b/lib/formfields/customer/formfield.mysql.php
deleted file mode 100644
index a9c01a22..00000000
--- a/lib/formfields/customer/formfield.mysql.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Formfields
- *
- */
-
-return array(
-	'section_a' => array(
-		'fields' => array(
-			'description' => array(
-				'label' => $lng['mysql']['databasedescription'],
-				'type' => 'text',
-			),
-			'mysql_server' => array(
-				'label' => $lng['mysql']['mysql_server'],
-				'type' => (isset($result)) ? 'select' : 'text',
-				'visible' => (1 < $count_mysqlservers ? true : false),
-				'values' => (isset($mysql_servers)) ? $mysql_servers : ""
-			),
-			'mysql_password' => array(
-				'label' => $lng['login']['password'],
-				'type' => 'password',
-				'attributes' => array(
-					'autocomplete' => 'off'
-				)
-			),
-			'mysql_password_suggestion' => array(
-				'label' => $lng['customer']['generated_pwd'],
-				'type' => 'text',
-				'visible' => (Settings::Get('panel.password_regex') == ''),
-				'value' => generatePassword(),
-				'attributes' => array(
-					'readonly' => true
-				)
-			),
-			'sendinfomail' => array(
-				'label' => $lng['customer']['sendinfomail'],
-				'type' => 'checkbox',
-				'visible' => 'new',
-				'attributes' => array(
-					'checked' => true
-				)
-			)
-		)
-	)
-);
\ No newline at end of file
diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php
new file mode 100644
index 00000000..b0dba786
--- /dev/null
+++ b/lib/formfields/customer/mysql/formfield.mysql_add.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ */
+return array(
+    'mysql_add' => array(
+        'title' => $lng['mysql']['database_create'],
+        'image' => 'icons/mysql_add.png',
+        'sections' => array(
+            'section_a' => array(
+                'title' => $lng['mysql']['database_create'],
+                'image' => 'icons/mysql_add.png',
+                'fields' => array(
+                    'description' => array(
+                        'label' => $lng['mysql']['databasedescription'],
+                        'type' => 'text'
+                    ),
+                    'mysql_server' => array(
+                        'visible' => (1 < $count_mysqlservers ? true : false),
+                        'label' => $lng['mysql']['mysql_server'],
+                        'type' => 'select',
+                        'select_var' => $mysql_servers
+                    ),
+                    'mysql_password' => array(
+                        'label' => $lng['login']['password'],
+                        'type' => 'password',
+                        'autocomplete' => 'off'
+                    ),
+                    'mysql_password_suggestion' => array(
+                        'label' => $lng['customer']['generated_pwd'],
+                        'type' => 'text',
+                        'visible' => (Settings::Get('panel.password_regex') == ''),
+                        'value' => generatePassword()
+                    ),
+                    'sendinfomail' => array(
+                        'label' => $lng['customer']['sendinfomail'],
+                        'type' => 'checkbox',
+                        'values' => array(
+                            array(
+                                'label' => $lng['panel']['yes'],
+                                'value' => '1'
+                            )
+                        ),
+                        'value' => array()
+                    )
+                )
+            )
+        )
+    )
+);
diff --git a/lib/formfields/customer/mysql/formfield.mysql_edit.php b/lib/formfields/customer/mysql/formfield.mysql_edit.php
new file mode 100644
index 00000000..5be87ed4
--- /dev/null
+++ b/lib/formfields/customer/mysql/formfield.mysql_edit.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Formfields
+ */
+return array(
+    'mysql_edit' => array(
+        'title' => $lng['mysql']['database_edit'],
+        'image' => 'icons/mysql_edit.png',
+        'sections' => array(
+            'section_a' => array(
+                'title' => $lng['mysql']['database_edit'],
+                'image' => 'icons/mysql_edit.png',
+                'fields' => array(
+                    'databasename' => array(
+                        'label' => $lng['mysql']['databasename'],
+                        'type' => 'label',
+                        'value' => $result['databasename']
+                    ),
+                    'description' => array(
+                        'label' => $lng['mysql']['databasedescription'],
+                        'type' => 'text',
+                        'value' => $result['description']
+                    ),
+                    'mysql_server' => array(
+                        'visible' => (1 < $count_mysqlservers ? true : false),
+                        'label' => $lng['mysql']['mysql_server'],
+                        'type' => 'label',
+                        'value' => $sql_root['caption']
+                    ),
+                    'mysql_password' => array(
+                        'label' => $lng['changepassword']['new_password_ifnotempty'],
+                        'type' => 'password',
+                        'autocomplete' => 'off'
+                    ),
+                    'mysql_password_suggestion' => array(
+                        'label' => $lng['customer']['generated_pwd'],
+                        'type' => 'text',
+                        'visible' => (Settings::Get('panel.password_regex') == ''),
+                        'value' => generatePassword()
+                    )
+                )
+            )
+        )
+    )
+);