diff --git a/trurt/manage.py b/trurt/manage.py
index 87aac60c2af70fdff5ea737cbf9aa3f2492898f4..9c550eb4269cf2ceb3a2438f6a662042c57d0e1e 100644
--- a/trurt/manage.py
+++ b/trurt/manage.py
@@ -30,12 +30,12 @@ def create_user(username, password):
 
 @trurt.command()
 @click.argument("username")
-@click.argument("spn")
+@click.argument("service_uuid")
 @click.argument("profile_username")
 @flask_cli.with_appcontext
-def create_profile(username, spn, profile_username):
+def create_profile(username, service_uuid, profile_username):
     user = models.User.query.filter_by(username=username).first()
-    service = models.Service.query.filter_by(spn=spn).first()
+    service = models.Service.query.get(service_uuid)
     profile = models.Profile()
     profile.user = user
     profile.service = service
diff --git a/trurt/models.py b/trurt/models.py
index b65fcac91b19fefc98c2ef7a3936be2aeba8e0c8..31b6868fc116463c3018a300a2c14a282709883e 100644
--- a/trurt/models.py
+++ b/trurt/models.py
@@ -74,15 +74,15 @@ class User(db.Model):
         user = cls.query.filter_by(username=username).first()
         if not user:
             return False
-        auth = Auth.query.filter_by(user_id=user.id).first()
-        if not auth:
+        auths = user.auths
+        if not auths:
             return False
-        if not auth.check_password(password):
+        if not auths[0].check_password(password):
             return False
         return user
 
     def get_id(self):
-        return self.id
+        return self.uuid
 
     def get_default_profile(self, service):
         profile = Profile()