re #5 : Working login feature with the new Entity