Add back support for user switch with GDM