diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index dbac9f4ed44..983549f9378 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -8,7 +8,7 @@
             <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial openerp</field>
-            <field name="body">Sign in with OpenERP.com</field>
+            <field name="body">Log in with OpenERP.com</field>
             <field name="enabled" eval="True"/>
         </record>
         <record id="provider_facebook" model="auth.oauth.provider">
@@ -18,7 +18,7 @@
             <field name="validation_endpoint">https://graph.facebook.com/me/permissions</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial facebook</field>
-            <field name="body">Sign in with facebook</field>
+            <field name="body">Log in with facebook</field>
         </record>
         <record id="provider_google" model="auth.oauth.provider">
             <field name="name">Google OAuth2</field>
@@ -27,7 +27,7 @@
             <field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field>
             <field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field>
             <field name="css_class">zocial google</field>
-            <field name="body">Sign in with google</field>
+            <field name="body">Log in with google</field>
         </record>
         <!--
         <record id="provider_twitter" model="auth.oauth.provider">
diff --git a/addons/auth_oauth/static/src/css/auth_oauth.css b/addons/auth_oauth/static/src/css/auth_oauth.css
index ed6130e3123..0489229042a 100644
--- a/addons/auth_oauth/static/src/css/auth_oauth.css
+++ b/addons/auth_oauth/static/src/css/auth_oauth.css
@@ -9,7 +9,6 @@
 }
 
 .openerp a.zocial.openerp {
-    float: right;
     border: 1px solid #222222;
     color: white;
     margin: 0;
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 9cbeb60638f..235ac047346 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -37,6 +37,5 @@ Allow users to sign up.
         'res_users_view.xml',
     ],
     'js': ['static/src/js/auth_signup.js'],
-    'css' : ['static/src/css/base.css'],
     'qweb': ['static/src/xml/auth_signup.xml'],
 }
diff --git a/addons/auth_signup/static/src/css/Makefile b/addons/auth_signup/static/src/css/Makefile
deleted file mode 100644
index d6b4f4b2fc8..00000000000
--- a/addons/auth_signup/static/src/css/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-base.css: base.sass
-	sass --trace -t expanded base.sass base.css
-
diff --git a/addons/auth_signup/static/src/css/base.css b/addons/auth_signup/static/src/css/base.css
deleted file mode 100644
index 3f97e7a9301..00000000000
--- a/addons/auth_signup/static/src/css/base.css
+++ /dev/null
@@ -1,10 +0,0 @@
-@charset "utf-8";
-.openerp .oe_login .oe_signup_show {
-  display: none;
-}
-.openerp .oe_login_signup .oe_signup_show {
-  display: block !important;
-}
-.openerp .oe_login_signup .oe_signup_hide {
-  display: none;
-}
diff --git a/addons/auth_signup/static/src/css/base.sass b/addons/auth_signup/static/src/css/base.sass
deleted file mode 100644
index f97665d192c..00000000000
--- a/addons/auth_signup/static/src/css/base.sass
+++ /dev/null
@@ -1,13 +0,0 @@
-@charset "utf-8"
-
-.openerp
-    // Regular login form
-    .oe_login
-        .oe_signup_show
-            display: none
-    // Signup form
-    .oe_login_signup
-        .oe_signup_show
-            display: block !important
-        .oe_signup_hide
-            display: none
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 962a54f5920..a6b401a4c7b 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -7,12 +7,15 @@ openerp.auth_signup = function(instance) {
             var self = this;
             var d = this._super();
 
+            self.$(".oe_signup_show").hide();
             // to switch between the signup and regular login form
             this.$('a.oe_signup_signup').click(function(ev) {
                 if (ev) {
                     ev.preventDefault();
                 }
                 self.$el.addClass("oe_login_signup");
+                self.$(".oe_signup_show").show();
+                self.$(".oe_signup_hide").hide();
                 return false;
             });
             this.$('a.oe_signup_back').click(function(ev) {
@@ -20,6 +23,8 @@ openerp.auth_signup = function(instance) {
                     ev.preventDefault();
                 }
                 self.$el.removeClass("oe_login_signup");
+                self.$(".oe_signup_show").hide();
+                self.$(".oe_signup_hide").show();
                 delete self.params.token;
                 return false;
             });
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
index b2f6ea81c92..a51ced3778d 100644
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ b/addons/auth_signup/static/src/xml/auth_signup.xml
@@ -17,12 +17,12 @@
             <li class="oe_signup_show"><input name="confirm_password" type="password"/></li>
         </t>
         <t t-jquery="form ul:first li:has(button[name=submit])" t-operation="replace">
-            <li class="oe_signup_hide"><button name="submit">Log in</button></li>
-            <li class="oe_signup_show"><button name="submit">Sign in</button></li>
-        </t>
-        <t t-jquery="form ul button" t-operation="after">
-            <a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a>
-            <a class="oe_signup_show oe_signup_back" href="#">Back to Login</a>
+            <li>
+                <button class="oe_signup_hide" name="submit">Log in</button>
+                <button class="oe_signup_show" name="submit">Sign up</button>
+                <a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a>
+                <a class="oe_signup_show oe_signup_back" href="#">Back to Login</a>
+            </li>
         </t>
     </t>