Fix bug 1071174: Use "username" consistently