proper routing and resolution
fixed loss of user info on refresh or return