diff --git a/src/js/yunohost/controllers/home.js b/src/js/yunohost/controllers/home.js
index 18469d8b..c0c9e924 100644
--- a/src/js/yunohost/controllers/home.js
+++ b/src/js/yunohost/controllers/home.js
@@ -35,6 +35,7 @@
                     var link=$('link', v)[0].innerHTML;
                     if (typeof link == 'string' && link !== '' && link.charAt(0) == '/')
                         link=forumUrl+link;
+
                     var description=$('description', v)[0].textContent;
                     description=description.replace('href="/','href="'+forumUrl+'/');
 
@@ -55,7 +56,6 @@
                         viewedItems.push(item.guid);
                     }
                 });
-
                 // Saved viewed items to cookie
                 $.cookie('ynhSecurityViewedItems', viewedItems, {
                     expire: 7
@@ -77,8 +77,8 @@
      */
 
     app.get('#/login', function (c) {
-        $('#masthead').show();
-        $('#masthead .logout-btn').hide();
+        $('#masthead').show()
+            .find('.logout-btn').hide();
         store.set('path-1', '#/login');
         if ($('div.loader').length === 0) {
             $('#main').append('<div class="loader loader-content"></div>');
diff --git a/src/views/login.ms b/src/views/login.ms
index 5cab8318..de7572e0 100644
--- a/src/views/login.ms
+++ b/src/views/login.ms
@@ -4,7 +4,7 @@
             <span class="fa-fw fa-cloud"></span>
             <span class="sr-only">{{t 'domain'}}</span>
         </label>
-        <input type="{{#if domain}}hidden{{else}}text{{/if}}" id="domain" name="domain" class="form-control" placeholder="{{t 'myserver_org'}}" value="{{domain}}">
+        <input type="{{#domain}}hidden{{else}}text{{/domain}}" id="domain" name="domain" class="form-control" placeholder="{{t 'myserver_org'}}" value="{{domain}}" />
     </div>
     <br />
     <div class="input-group">
@@ -12,7 +12,7 @@
             <span class="fa-fw fa-lock"></span>
             <span class="sr-only">{{t 'password'}}</span>
         </label>
-        <input type="password" id="password" name="password" class="form-control" placeholder="{{t 'administration_password'}}">
+        <input type="password" id="password" name="password" class="form-control" placeholder="{{t 'administration_password'}}" />
     </div>
     <br />
     <input id="submit" type="submit" value="{{t 'login'}}" class="btn btn-success pull-right" />