Fixed user save logic