diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index d631c6df8..e0d75e6d7 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -83,9 +83,6 @@
 
     %p
       = f.select :language, available_language_options
-      %span#grammatical_gender_block{options_for_grammatical_gender_block(current_user)}
-        = "    " + t('.address_me_as')
-        = select_tag 'user[grammatical_gender]', options_for_gender_select(current_user), :disabled => gender_select_disabled(current_user)
       = f.submit t('.change_language')
 
   %br
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index 4113e7ed9..cdf3879b7 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -5,6 +5,8 @@
 require 'spec_helper'
 
 describe PhotosController do
+  render_views
+
   let(:user) {make_user}
   let(:user2) {make_user}
 
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 13699c59b..6e0bd5f60 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -5,6 +5,7 @@
 require 'spec_helper'
 
 describe UsersController do
+  render_views
 
   let(:user) { make_user }
   let!(:aspect) { user.aspects.create(:name => "lame-os") }
@@ -60,4 +61,11 @@ describe UsersController do
       end
     end
   end
+
+  describe '#edit' do
+    it "returns a 200" do
+      get 'edit', :id => user.id      
+      response.code.should == "200"
+    end
+  end
 end