Fixed creating objects on every Login