fixed nil return for current_user take 2