User upgrade #1078

Closes  #1078