added current_user validation