--- a/oauth/oauth.py	Fri Mar 11 14:47:56 2016 +0100
+++ b/oauth/oauth.py	Fri Mar 11 16:28:23 2016 +0100
@@ -8,6 +8,7 @@
 from werkzeug.security import gen_salt
 from flask_oauthlib.provider import OAuth2Provider
 from settings.oauth_settings import OAuthSettings
+import uuid
 
 app = Flask(__name__, template_folder='templates')
 app.debug = True
@@ -21,9 +22,9 @@
 
 
 class User(db.Model):
-    id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.String(256), primary_key=True)
     username = db.Column(db.String(40), unique=True)
-
+    uai = db.Column(db.String(40), default="uaidefault")
 
 class Client(db.Model):
     client_id = db.Column(db.String(40), primary_key=True)
@@ -128,7 +129,7 @@
         username = request.form.get('username')
         user = User.query.filter_by(username=username).first()
         if not user:
-            user = User(username=username)
+            user = User(id=str(uuid.uuid4()), username=username)
             db.session.add(user)
             db.session.commit()
         session['id'] = user.id
@@ -224,7 +225,7 @@
 @oauth.require_oauth()
 def user_info():
     user = request.oauth.user
-    return jsonify(id=user.id, displayName=user.username)
+    return jsonify(id=user.id, displayName=user.username, ENTPersonStructRattachUAI=user.uai)
 
 @app.route('/rest/oauth/validate/<token>')
 def validate_token(token):