Further additions to findOrCreateUser