Merge pull request #2343 from joto/username #1337

Job	Run time
ubuntu-test-install (middle_schema)	9m 7s
ubuntu-test-install (public)	8m 36s
	17m 43s

Provide feedback