Made some updates on User management.