diff --git a/app/models/user.rb b/app/models/user.rb
index 56019f4..e274c6a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,8 +24,8 @@ class User
   has_one :desktop, :dependent => :destroy
 
 
-  validates :user_name, presence: true, uniqueness: true
-  validates :password, presence: true, :on => :create, length: {:in => 8..20}
+  validates :user_name, uniqueness: true
+  validates :password, :on => :create, length: {:in => 8..20}
 
   #Add getter and setter for email virtual field
   attr_accessor :email, :first_name, :last_name
diff --git a/app/views/admin/members/_user_basic_passwd.html.erb b/app/views/admin/members/_user_basic_passwd.html.erb
index 4d3b05b..035746d 100644
--- a/app/views/admin/members/_user_basic_passwd.html.erb
+++ b/app/views/admin/members/_user_basic_passwd.html.erb
@@ -12,8 +12,12 @@
           <label for="user_name" class="control-label"><%= t("users.user_id")%></label>
         </label>
         <div class="controls add-input">
+        <% if current_user.is_admin? %>
           <%= f.text_field :user_name, :class=>"input-medium", :id=>"account", :placeholder=>"#{t('users.user_id')}" %>
-          <span class="help-block"><%= t("users.user_id_note")%></span>
+           <span class="help-block"><%= t("users.user_id_note")%></span>
+        <% else %>
+          <p class="lead"> <%= @user.user_name rescue "" %> </p>
+        <% end %>
         </div>
       </div>
 
diff --git a/app/views/page_parts/_widget_form.html.erb b/app/views/page_parts/_widget_form.html.erb
index 537e812..c4f0b3b 100644
--- a/app/views/page_parts/_widget_form.html.erb
+++ b/app/views/page_parts/_widget_form.html.erb
@@ -4,7 +4,7 @@
 	<% if @widget_types.first.kind_of?(Hash) %>
 		<select name="page_part[sub_parts_attributes][<%= @select_number %>][widget_type]" id="page_layout" class="select2">
 				<% @widget_types.each do |lt| %>
-					<option value="<%= lt["filename"] %>" <%= ((lt["filename"] == @subpart.widget_type ? "selected=selected" : "") rescue nil) %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"][I18n.locale.to_s] rescue lt["name"] %></option>
+					<option value="<%= lt["filename"] %>" <%= ((lt["filename"] == @subpart.widget_type ? "selected=selected" : "") rescue nil) %> data-image="<%= lt["thumbnail"] %>"><%= (lt["name"].kind_of?(Hash) ? lt["name"][I18n.locale.to_s] : lt["name"]) %></option>
 				<% end %>
 			</select>
 			<script type="text/javascript">