FEATURE - record current_user.login as username