user_suffix becomes username_suffix because it's confusing me
Code now matches config