Added reset,password as disallowed usernames
Merged neo1001's patch