Avoid duplicate User->username in controller
fixes #515
Merge pull request #550 from marekmurawski/issue-515

Avoid duplicate User->username in controller