Fix login and create new row when create user
Merge remote-tracking branch 'origin/develop' into NewEntryBranch