Fix to user client related to earlier changes moving stuff out of form into session