Fix User constant missing on second request
Merge branch 'account' into account2
Adding account2 changes back, mostly lost in merge the first time