diff --git a/app/models/issue.rb b/app/models/issue.rb
index f0ad319..b1e8549 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -53,7 +53,8 @@ class Issue < ActiveRecord::Base
 
   before_validation :init_variables, :if => Proc.new{|issue| issue.new_record?}
   before_save :parse_text
-  after_save :remove_readings
+  # FIXME
+  # after_save :remove_readings
 
   acts_as_readable
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 4277f51..c04157f 100755
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -355,6 +355,9 @@ class User < ActiveRecord::Base
   end
 
   def self.params(params, cuser)
-    params.require(:user).permit(:raw_password, :firstname, :lastname, :email, :steamid, :country, :birthdate, :timezone, :public_email, :filter, :team_id)
+    profile_attrs = cuser.profile.attributes.keys - ["id", "created_at", "updated_at"]
+    allowed = [:raw_password, :firstname, :lastname, :email, :steamid, :country, :birthdate, :timezone, :public_email, :filter, :time_zone, :team_id, profile_attributes: [profile_attrs]]
+    allowed << :username if cuser.admin?
+    params.require(:user).permit(*allowed)
   end
 end
diff --git a/app/views/gathers/edit.html.erb b/app/views/gathers/edit.html.erb
index b396d7f..c9d4f27 100644
--- a/app/views/gathers/edit.html.erb
+++ b/app/views/gathers/edit.html.erb
@@ -1,73 +1,73 @@
 <h1>Gather Admin: #<%= @gather.id %></h1>
 
 <div class="restart">
-  <h3>Restart Gather</h3>
+    <h3>Restart Gather</h3>
 
-  <%= form_for(@gather, html: { class: 'square' }) do |f| %>
+    <%= form_for(@gather, html: { class: 'square' }) do |f| %>
     <%= render 'shared/errors', messages: @gather.errors.full_messages %>
-    
+
     <%= f.hidden_field :admin %>
 
     <div class="fields horizontal">
-      <%= f.label :captain1 %>
-      <%= f.select :captain1_id, @gather.gatherers.collect{|c| [c, c.id]} %>
+        <%= f.label :captain1 %>
+        <%= f.select :captain1_id, @gather.gatherers.collect{|c| [c, c.id]} %>
     </div>
     <div class="fields horizontal">
-      <%= f.label :captain2 %>
-      <%= f.select :captain2_id, @gather.gatherers.collect{|c| [c, c.id]} %>
+        <%= f.label :captain2 %>
+        <%= f.select :captain2_id, @gather.gatherers.collect{|c| [c, c.id]} %>
     </div>
 
     <div class="controls">
-      <%= f.submit 'Restart Gather' %>
+        <%= f.submit 'Restart Gather' %>
     </div>
-  <% end %>
+    <% end %>
 </div>
 
 <div class="turns">
-  <h3>Change Turns</h3>
+    <h3>Change Turns</h3>
 
-  <%= form_for(@gather, html: { class: 'square' }) do |f| %>
+    <%= form_for(@gather, html: { class: 'square' }) do |f| %>
     <%= render 'shared/errors', messages: @gather.errors.full_messages %>
 
     <div class="fields horizontal">
-      <%= f.label :turn %>
-      <%= f.select :turn, ['Team 1', 'Team 2'] %>
+        <%= f.label :turn %>
+        <%= f.select :turn, ['Team 1', 'Team 2'] %>
     </div>
     <div class="controls">
-      <%= f.submit 'Change Turn' %>
+        <%= f.submit 'Change Turn' %>
     </div>
-  <% end %>
+    <% end %>
 </div>
 
 
 <div class="replace">
-  <h3>Replace Players</h3>
+    <h3>Replace Players</h3>
 
-  <% if @gather.gatherers.first %>
+    <% if @gather.gatherers.first %>
     <%= form_for(@gather.gatherers.first, html: { class: 'square' }) do |f| %>
-      <div class="fields horizontal">
+    <div class="fields horizontal">
         <%= f.label :id, "Select Player" %>
         <%= f.select :id, @gather.gatherers.collect{|g| [g.user, g.id]} %>
-      </div>
-      <div class="fields horizontal">
+    </div>
+    <div class="fields horizontal">
         <%= f.label :username, "Replace with:" %>
         <%= f.text_field :username %>
-      </div>
-      <div class="controls">
+    </div>
+    <div class="controls">
         <%= f.submit 'Replace Player' %>
-      </div>
+    </div>
+    <% end %>
     <% end %>
-  <% end %>
 </div>
 
 <div class="restart">
-  <h3>Start New</h3>
-  <%= form_for Gather.new do |f| %>
+    <h3>Start New</h3>
+    <%= form_for Gather.new do |f| %>
     <% f.object.category = @gather.category %>
     <%= f.hidden_field :category_id %>
 
     <div class="controls">
-      <%= f.submit "Start New Gather (#{f.object.category})" %>
+        <%= f.submit "Start New Gather (#{f.object.category})" %>
     </div>
-  <% end %>
-</div>
+    <% end %>
+</div>
\ No newline at end of file