fix current_user issues