modified current_user method