diff --git a/addons/base/static/lib/qweb/qweb2.js b/addons/base/static/lib/qweb/qweb2.js
index e617df60183..4f136f3c98a 100644
--- a/addons/base/static/lib/qweb/qweb2.js
+++ b/addons/base/static/lib/qweb/qweb2.js
@@ -304,6 +304,7 @@ QWeb2.Engine = (function() {
                     "   /* START TEMPLATE */ try {\n" +
                     (e.compile()) + "\n" +
                     "   /* END OF TEMPLATE */ } catch(error) {\n" +
+                    "       if (console && console.exception) console.exception(error);\n" +
                     "       context.engine.tools.exception('Runtime Error: ' + error, context);\n" +
                     "   }\n" +
                     "   return r.join('');";
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index a4c1b22cf4f..48839fb44ee 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -921,6 +921,11 @@ openerp.base.Login =  openerp.base.Controller.extend({
             this.selected_db = localStorage.getItem('last_db_login_success');
             this.selected_login = localStorage.getItem('last_login_login_success');
         }
+        if (jQuery.deparam(jQuery.param.querystring()).debug != undefined) {
+            this.selected_db = "trunk";
+            this.selected_login = "admin";
+            this.selected_password = "a";
+        }
     },
     start: function() {
         var self = this;
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 9c2df09732f..992884be243 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -86,7 +86,8 @@
                     </tr>
                     <tr>
                         <td><label for="password">Password:</label></td>
-                        <td><input type="password" name="password"/></td>
+                        <td><input type="password" name="password"
+                                t-att-value="selected_password || ''"/></td>
                     </tr>
                     <tr>
                         <td></td>