Fixing current_user