diff --git a/auth_saml/views/auth_saml.xml b/auth_saml/views/auth_saml.xml
index a0f4e1b855..f7a907c5b2 100644
--- a/auth_saml/views/auth_saml.xml
+++ b/auth_saml/views/auth_saml.xml
@@ -21,7 +21,10 @@
     </template>
     <template id="auth_saml.login" inherit_id="web.login" name="Samlv2 Login buttons">
         <xpath expr="//form" position="before">
-            <t t-set="form_small" t-value="len(saml_providers) &gt; 2" />
+            <t
+                t-set="form_small"
+                t-value="saml_providers and len(saml_providers) &gt; 2 or False"
+            />
         </xpath>
         <xpath expr="//div[hasclass('o_login_auth')]" position="inside">
             <t t-call="auth_saml.providers" />
diff --git a/auth_sms/templates/template_code.xml b/auth_sms/templates/template_code.xml
index 072d3fb7b2..4d804e947e 100644
--- a/auth_sms/templates/template_code.xml
+++ b/auth_sms/templates/template_code.xml
@@ -5,6 +5,8 @@
             <attribute name="t-attf-action">/auth_sms/code</attribute>
             <attribute name="onsubmit" />
         </xpath>
+        <!-- Remove database selector. -->
+        <xpath expr="//label[@for='db']/parent::div" position="replace" />
         <xpath expr="//form" position="inside">
             <input type="hidden" name="secret" t-att-value="secret" />
             <input type="hidden" name="user_login" t-att-value="login" />
@@ -17,5 +19,8 @@
         <xpath expr="//label[@for='password']" position="replace">
             <label for="password" class="control-label">Code</label>
         </xpath>
+        <xpath expr="//input[@name='password']" position="attributes">
+            <attribute name="placeholder" />
+        </xpath>
     </template>
 </odoo>