Fix bug where user role would not update if username or password did not change.
Merge branch 'develop'