Fix: go back and save user data