diff --git a/app/widgets/Chat/_chat_contact.tpl b/app/widgets/Chat/_chat_contact.tpl
index f93636e84..dfffa0cd9 100644
--- a/app/widgets/Chat/_chat_contact.tpl
+++ b/app/widgets/Chat/_chat_contact.tpl
@@ -24,23 +24,23 @@
                         state = 0;
                         {$send}
                         return false;
-                    }/* else {
+                    } else {
                         if(state == 0 || state == 2) {
                             state = 1;
                             {$composing}
                             since = new Date().getTime();
                         }
-                    }*/
+                    }
                     "
                 onkeyup="
                     movim_textarea_autoheight(this);
-                    /*setTimeout(function()
+                    setTimeout(function()
                     {
                         if(state == 1 && since+5000 < new Date().getTime()) {
                             state = 2;
                             {$paused}
                         }
-                    },5000); */
+                    },5000); 
                     "
             ></textarea>
         </div>
diff --git a/app/widgets/Login/login.css b/app/widgets/Login/login.css
index 087a4c448..220f3c047 100644
--- a/app/widgets/Login/login.css
+++ b/app/widgets/Login/login.css
@@ -37,10 +37,6 @@ body {
     color: white;
 }
 
-#loginpage #warning {
-    margin-bottom: 0.7em;
-}
-
 #loginpage #connectform {
     box-shadow: 0px 0.1em 0px rgba(0, 0, 0, 0.2);
     padding: 0.5em;
@@ -80,6 +76,7 @@ body {
 #loginpage .infos {
     color: white;
     text-align: center;
+    line-height: 2em;
 }
 
 #loginpage #loginhelp {
diff --git a/app/widgets/Login/login.tpl b/app/widgets/Login/login.tpl
index 5d910ded3..9172ee7ef 100644
--- a/app/widgets/Login/login.tpl
+++ b/app/widgets/Login/login.tpl
@@ -66,16 +66,17 @@
             <iframe id="passwordiframe" name="passwordiframe" style="display: none;"></iframe>
             
             <div id="warning">{$warnings}</div>
-            <div class="infos">
-                    {$c->t('Population')} {$pop} • 
-                    {$c->t('No account yet ?')}
-                    <a href="{$c->route('account')}">
-                        {$c->t('Create one !')}
-                    </a>
-            </div>
             <div class="clear"></div>
 
         </form>
+
+        <div class="infos">
+                {$c->t('Population')} {$pop} • 
+                {$c->t('No account yet ?')}
+                <a href="{$c->route('account')}">
+                    {$c->t('Create one !')}
+                </a>
+        </div>
     {/if}
 
     <div class="admin">
diff --git a/themes/movim/css/mobile.css b/themes/movim/css/mobile.css
index 51391517a..cd3cf9958 100644
--- a/themes/movim/css/mobile.css
+++ b/themes/movim/css/mobile.css
@@ -167,6 +167,7 @@ table#feedsubmitform {
 }
 
 #loginpage {
+    margin: 0.5em !important;
     margin-top: 20% ! important;
     background-position: center 0em !important;
 }