Fix issue with returning already saved user