diff --git a/app/views/devise/ichain_sessions/new.html.haml b/app/views/devise/ichain_sessions/new.html.haml
index 0d873e06..17085775 100644
--- a/app/views/devise/ichain_sessions/new.html.haml
+++ b/app/views/devise/ichain_sessions/new.html.haml
@@ -10,11 +10,8 @@
             = f.input :url, as: :hidden, input_html: { value: @back_url }
             = f.input :context, as: :hidden, input_html: { value: @context }
             = f.input :proxypath, as: :hidden, input_html: { value: @proxypath }
-
             = f.input :username, input_html: { autofocus: true }
             = f.input :password, as: :password
-
             %p.text-right
               = f.action :submit, as: :button, label: 'Sign In', button_html: { class: 'btn btn-success' }
-
             = render partial: 'devise/shared/help'
diff --git a/app/views/devise/registrations/edit.html.haml b/app/views/devise/registrations/edit.html.haml
index d97b4867..ce3bb7d5 100644
--- a/app/views/devise/registrations/edit.html.haml
+++ b/app/views/devise/registrations/edit.html.haml
@@ -2,21 +2,22 @@
   .row
     .col-md-12
       .page-header
-        %h1 Edit your Account
+        %h1 Edit Your Account
   .row
     .col-md-12
       = semantic_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
         = f.input :username, required: false, input_html: { autocomplete: 'off' }
         = f.input :email, required: false, input_html: { autocomplete: 'off' }
-        = f.input :email_public
+        = f.input :email_public, label: "Make my email public"
         = f.input :password, hint: "(Leave blank if you don't want to change it)", input_html: { autocomplete: 'off' }
         = f.input :password_confirmation, input_html: { autocomplete: 'off' }
         = f.inputs name: 'OpenID' do
-          %h4
-            Currently the following openIDs are associated with your account
-          - @openids.each do |openid|
-            %li= "#{openid.provider}:#{openid.email}"
-            %br
+          - if @openids.present?
+            %h4
+              Currently the following openIDs are associated with your account
+              - @openids.each do |openid|
+                %li= "#{openid.provider}:#{openid.email}"
+                %br
           %h4
             To add an openID with a different email address to your account, sign in with your
             openID while logged in to OSEM