current_user issue resolved