diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c7e2979b1..ac978b55c 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -18,7 +18,7 @@ class UsersController < ApplicationController
   end
 
   def edit
-    @user = User.first(:id => params[:id])
+    @user = current_user
     @person = @user.person
     @profile = @user.profile
     @photos = Photo.where(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC'
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index a0e7d95c6..2d9724914 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -1,6 +1,5 @@
 module GroupsHelper
   def link_for_group( group )
-    puts request.params
     link_to group.name, group
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index c40541431..5032ef273 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -123,6 +123,8 @@ class User
 
   ########### Profile ######################
   def update_profile(params)
+    params[:profile].delete(:image_url) if params[:profile][:image_url].empty?
+
     if self.person.update_attributes(params)
       self.profile.push_to( self.friends.all )
       true