diff --git a/app/models/user.rb b/app/models/user.rb
index fb6ed9dc4..df533d491 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -29,6 +29,7 @@ class User
   key :getting_started, Boolean, :default => true
   key :disable_mail, Boolean, :default => false
 
+  key :email, String
   key :language, String
 
   before_validation :strip_and_downcase_username, :on => :create
@@ -54,7 +55,6 @@ class User
 
   many :services, :class => Service
   timestamps!
-  #after_create :seed_aspects
 
   before_destroy :disconnect_everyone, :remove_person
   before_save do
@@ -83,7 +83,6 @@ class User
   end
 
   ######## Making things work ########
-  key :email, String
 
   def method_missing(method, *args)
     self.person.send(method, *args) if self.person
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 4a052c3d2..0e493159c 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -85,8 +85,7 @@
         = yield
 
     .clearfix
-
-      =render :partial => 'layouts/debug.haml'
+      /=render :partial => 'layouts/debug.haml'
     %footer
       .container
         = image_tag 'powered_by_diaspora.png', :height => "11px", :width => "145px"