More work on User Authentication