diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 5d424c0bccc..72844f30f04 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -739,7 +739,6 @@ openerp.base.Database = openerp.base.Controller.extend({
     
     do_db_create: function() {
         var self = this;
-       	self.db_string = "CREATE DATABASE";
        	self.$option_id.html(QWeb.render("CreateDB", self));
        	
        	$("form[name=create_db_form]").validate();
@@ -797,7 +796,6 @@ openerp.base.Database = openerp.base.Controller.extend({
 	
     do_db_drop: function() {
         var self = this;
-        self.db_string = "DROP DATABASE";
        	self.$option_id.html(QWeb.render("DropDB", self));
        	
        	$("form[name=drop_db_form]").validate();
@@ -833,7 +831,6 @@ openerp.base.Database = openerp.base.Controller.extend({
     
     do_db_backup: function() {
         var self = this;
-        self.db_string = "BACKUP DATABASE";
        	self.$option_id.html(QWeb.render("BackupDB", self));
        	
        	$("form[name=backup_db_form]").validate();
@@ -866,7 +863,6 @@ openerp.base.Database = openerp.base.Controller.extend({
     
     do_db_restore: function() {
         var self = this;
-        self.db_string = "RESTORE DATABASE";
        	self.$option_id.html(QWeb.render("RestoreDB", self));
        	
        	$("form[name=restore_db_form]").validate();
@@ -900,7 +896,6 @@ openerp.base.Database = openerp.base.Controller.extend({
 
     do_change_password: function() {
         var self = this;
-       	self.db_string = "CHANGE DATABASE PASSWORD";
        	self.$option_id.html(QWeb.render("Change_DB_Pwd", self));
        	
        	$("form[name=change_pwd_form]").validate();
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 3baaa01ad4b..de2c9eb029e 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -59,180 +59,180 @@
     Loading...
 </t>
 <t t-name="Database">
-	<ul class="db_options" style="padding: 0px; display: inline;">
-		<li id="db-create">Create</li>
-		<li id="db-drop">Drop</li>
-		<li id="db-backup">Backup</li>
-		<li id="db-restore">Restore</li>
-		<li id="db-change-password">Password</li>
-		<li id="back-to-login">Back to Login</li>
-	</ul>
+    <ul class="db_options" style="padding: 0px; display: inline;">
+        <li id="db-create">Create</li>
+        <li id="db-drop">Drop</li>
+        <li id="db-backup">Backup</li>
+        <li id="db-restore">Restore</li>
+        <li id="db-change-password">Password</li>
+        <li id="back-to-login">Back to Login</li>
+    </ul>
 </t>
 <t t-name="CreateDB">
-	<form name="create_db_form" method="POST">
-		<table width="100%">
-			<tr>
-				<td class="option_string">
-					<t t-esc="db_string"/>
-				</td>
-			</tr>
-		</table>
-		<table align="center" class="db_option_table">
-			<tr>
-				<td><label for="super_admin_pwd">Super admin password:</label></td>
-				<td><input type="password" name="super_admin_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td><label for="db_name">New database name:</label></td>
-				<td><input type="text" name="db_name" class="required"/></td>
-			</tr>
-			<tr>
-				<td><label for="demo_data">Load Demonstration data:</label></td>
-				<td><input type="checkbox" name="demo_data" checked='checked'/></td>
-			</tr>
-			<tr>
-				<td><label for="db_lang">Default language:</label></td>
-				<td>
-					<t t-if="lang_list">
-		            	<select name="db_lang">
-		                	<t t-foreach="lang_list" t-as="lang">
-	                        	<option t-att-value="lang[0]"><t t-esc="lang[1]"/></option>
-	                    	</t>
-		            	</select>
-		        	</t>
-		    	</td>
-			</tr>
-			<tr>
-				<td><label for="create_admin_pwd">Super admin password:</label></td>
-				<td><input type="password" name="create_admin_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td><label for="create_confirm_pwd">Confirm password:</label></td>
-				<td><input type="password" name="create_confirm_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td colspan="2" align="right"><input type="submit" value="Create"/></td>
-			</tr>
-		</table>
-	</form>
+    <form name="create_db_form" method="POST">
+        <table width="100%">
+            <tr>
+                <td class="option_string">
+                    CREATE DATABASE
+                </td>
+            </tr>
+        </table>
+        <table align="center" class="db_option_table">
+            <tr>
+                <td><label for="super_admin_pwd">Super admin password:</label></td>
+                <td><input type="password" name="super_admin_pwd" class="required"/></td>
+            </tr>
+            <tr>
+                <td><label for="db_name">New database name:</label></td>
+                <td><input type="text" name="db_name" class="required"/></td>
+            </tr>
+            <tr>
+                <td><label for="demo_data">Load Demonstration data:</label></td>
+                <td><input type="checkbox" name="demo_data" checked='checked'/></td>
+            </tr>
+            <tr>
+                <td><label for="db_lang">Default language:</label></td>
+                <td>
+                    <t t-if="lang_list">
+                        <select name="db_lang">
+                          <t t-foreach="lang_list" t-as="lang">
+                                <option t-att-value="lang[0]"><t t-esc="lang[1]"/></option>
+                            </t>
+                        </select>
+                    </t>
+            </td>
+            </tr>
+            <tr>
+                <td><label for="create_admin_pwd">Super admin password:</label></td>
+                <td><input type="password" name="create_admin_pwd" class="required"/></td>
+            </tr>
+            <tr>
+                <td><label for="create_confirm_pwd">Confirm password:</label></td>
+                <td><input type="password" name="create_confirm_pwd" class="required"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" align="right"><input type="submit" value="Create"/></td>
+            </tr>
+        </table>
+    </form>
 </t>
 <t t-name="DropDB">
-	<form name="drop_db_form" method="POST">
-		<table width="100%">
-			<tr>
-				<td class="option_string">
-					<t t-esc="db_string"/>
-				</td>
-			</tr>
-		</table>
-		<table align="center" class="db_option_table">
-			<tr>
-				<td><label for="drop_db">Database:</label></td>
-				<t t-if="db_list">
-	            	<select name="drop_db">
-	                	<t t-foreach="db_list" t-as="db">
-	                       	<option t-att-value="db"><t t-esc="db"/></option>
-	                	</t>
-	            	</select>
-	        	</t>
-			</tr>
-			<tr>
-				<td><label for="drop_password">Password:</label></td>
-				<td><input type="password" name="drop_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td colspan="2" align="right"><input type="submit" value="Drop"/></td>
-			</tr>
-		</table>
-	</form>
+    <form name="drop_db_form" method="POST">
+        <table width="100%">
+            <tr>
+                <td class="option_string">
+                    DROP DATABASE
+                </td>
+            </tr>
+        </table>
+        <table align="center" class="db_option_table">
+            <tr>
+                <td><label for="drop_db">Database:</label></td>
+                <t t-if="db_list">
+                <select name="drop_db">
+                        <t t-foreach="db_list" t-as="db">
+                           	<option t-att-value="db"><t t-esc="db"/></option>
+                        </t>
+                    </select>
+                </t>
+            </tr>
+            <tr>
+                <td><label for="drop_password">Password:</label></td>
+                <td><input type="password" name="drop_pwd" class="required"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" align="right"><input type="submit" value="Drop"/></td>
+            </tr>
+        </table>
+    </form>
 </t>
 <t t-name="BackupDB">
-	<form name="backup_db_form" method="POST">
-		<table width="100%">
-			<tr>
-				<td class="option_string">
-					<t t-esc="db_string"/>
-				</td>
-			</tr>
-		</table>
-		<table align="center" class="db_option_table">
-			<tr>
-				<td><label for="backup_db">Database:</label></td>
-				<td>
-					<t t-if="db_list">
-		            	<select name="backup_db">
-		                	<t t-foreach="db_list" t-as="db">
-		                       	<option t-att-value="db"><t t-esc="db"/></option>
-		                	</t>
-		            	</select>
-		        	</t>
-		        </td>
-			</tr>
-			<tr>
-				<td><label for="backup_pwd">Password:</label></td>
-				<td><input type="password" name="backup_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td colspan="2" align="right"><input type="submit" value="Backup"/></td>
-			</tr>
-		</table>
-	</form>
+    <form name="backup_db_form" method="POST">
+        <table width="100%">
+            <tr>
+                <td class="option_string">
+                    BACKUP DATABASE
+                </td>
+            </tr>
+        </table>
+        <table align="center" class="db_option_table">
+            <tr>
+                <td><label for="backup_db">Database:</label></td>
+                <td>
+                    <t t-if="db_list">
+                    <select name="backup_db">
+                            <t t-foreach="db_list" t-as="db">
+                               	<option t-att-value="db"><t t-esc="db"/></option>
+                            </t>
+                        </select>
+                    </t>
+                </td>
+            </tr>
+            <tr>
+                <td><label for="backup_pwd">Password:</label></td>
+                <td><input type="password" name="backup_pwd" class="required"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" align="right"><input type="submit" value="Backup"/></td>
+            </tr>
+        </table>
+    </form>
 </t>
 <t t-name="RestoreDB">
-	<form name="restore_db_form" method="POST">
-		<table width="100%">
-			<tr>
-				<td class="option_string">
-					<t t-esc="db_string"/>
-				</td>
-			</tr>
-		</table>
-		<table align="center" class="db_option_table">
-			<tr>
-				<td><label for="restore_db">File:</label></td>
-				<td><input type="file" name="restore_db" class="required"/></td>
-			</tr>
-			<tr>
-				<td><label for="restore_pwd">Password:</label></td>
-				<td><input type="password" name="restore_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td><label for="new_db">New database name:</label></td>
-				<td><input type="text" name="new_db" class="required"/></td>
-			</tr>
-			<tr>
-				<td colspan="2" align="right"><input type="submit" value="Restore"/></td>
-			</tr>
-		</table>
-	</form>
+    <form name="restore_db_form" method="POST">
+        <table width="100%">
+            <tr>
+                <td class="option_string">
+                    RESTORE DATABASE
+                </td>
+            </tr>
+        </table>
+        <table align="center" class="db_option_table">
+            <tr>
+                <td><label for="restore_db">File:</label></td>
+                <td><input type="file" name="restore_db" class="required"/></td>
+            </tr>
+            <tr>
+                <td><label for="restore_pwd">Password:</label></td>
+                <td><input type="password" name="restore_pwd" class="required"/></td>
+            </tr>
+        <tr>
+                <td><label for="new_db">New database name:</label></td>
+                <td><input type="text" name="new_db" class="required"/></td>
+            </tr>
+        <tr>
+            <td colspan="2" align="right"><input type="submit" value="Restore"/></td>
+            </tr>
+        </table>
+    </form>
 </t>
 <t t-name="Change_DB_Pwd">
-	<form name="change_pwd_form" method="POST">
-		<table width="100%">
-			<tr>
-				<td class="option_string">
-					<t t-esc="db_string"/>
-				</td>
-			</tr>
-		</table>
-		<table align="center" class="db_option_table">
-			<tr>
-				<td><label for="old_pwd">Old password:</label></td>
-				<td><input type="password" name="old_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td><label for="new_pwd">New password:</label></td>
-				<td><input type="password" name="new_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td><label for="confirm_pwd">Confirm password:</label></td>
-				<td><input type="password" name="confirm_pwd" class="required"/></td>
-			</tr>
-			<tr>
-				<td colspan="2" align="right"><input type="submit" value="Change Password"/></td>
-			</tr>
-		</table>
-	</form>
+    <form name="change_pwd_form" method="POST">
+        <table width="100%">
+            <tr>
+                <td class="option_string">
+                    CHANGE DATABASE PASSWORD
+                </td>
+            </tr>
+        </table>
+        <table align="center" class="db_option_table">
+            <tr>
+                <td><label for="old_pwd">Old password:</label></td>
+                <td><input type="password" name="old_pwd" class="required"/></td>
+            </tr>
+            <tr>
+            <td><label for="new_pwd">New password:</label></td>
+       	    <td><input type="password" name="new_pwd" class="required"/></td>
+            </tr>
+   	    <tr>
+                <td><label for="confirm_pwd">Confirm password:</label></td>
+                <td><input type="password" name="confirm_pwd" class="required"/></td>
+            </tr>
+            <tr>
+                <td colspan="2" align="right"><input type="submit" value="Change Password"/></td>
+            </tr>
+        </table>
+    </form>
 </t>
 <t t-name="Login">
     <form>