UserAuth fixes