Switched to using the services for the user-session migrations. Fixed spacing in user-preferences.