diff --git a/edivorce/apps/core/middleware/bceid_middleware.py b/edivorce/apps/core/middleware/bceid_middleware.py
index cb73590f..17c3ddbf 100644
--- a/edivorce/apps/core/middleware/bceid_middleware.py
+++ b/edivorce/apps/core/middleware/bceid_middleware.py
@@ -7,10 +7,9 @@ from django.shortcuts import redirect
 
 
 class BceidUser(object):
-    def __init__(self, guid, first_name, last_name, user_type, is_authenticated):
+    def __init__(self, guid, display_name, user_type, is_authenticated):
         self.guid = guid
-        self.first_name = first_name
-        self.last_name = last_name
+        self.display_name = display_name
         self.type = user_type
         self.is_authenticated = is_authenticated
 
@@ -36,8 +35,7 @@ class BceidMiddleware(object):
                 guid=smgov_userguid,
                 is_authenticated=True,
                 user_type='BCEID',
-                first_name=smgov_userdisplayname,
-                last_name=''
+                display_name=smgov_userdisplayname
             )
 
         elif localdev and request.session.get('fake-bceid-guid', False):
@@ -47,8 +45,7 @@ class BceidMiddleware(object):
                 guid=request.session.get('fake-bceid-guid'),
                 is_authenticated=True,
                 user_type='FAKE',
-                first_name=request.session.get('login-name',''),
-                last_name=''
+                display_name=request.session.get('login-name', '')
             )
 
         else:
@@ -58,8 +55,7 @@ class BceidMiddleware(object):
                 guid=None,
                 is_authenticated=False,
                 user_type='ANONYMOUS',
-                first_name='',
-                last_name=''
+                display_name=''
             )
 
     def process_response(self, request, response):
diff --git a/edivorce/apps/core/migrations/0015_auto_20170330_0522.py b/edivorce/apps/core/migrations/0015_auto_20170330_0522.py
new file mode 100644
index 00000000..4380f803
--- /dev/null
+++ b/edivorce/apps/core/migrations/0015_auto_20170330_0522.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0014_auto_20170325_0510'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bceiduser',
+            name='user_guid',
+            field=models.CharField(db_index=True, unique=True, max_length=32),
+        ),
+    ]
diff --git a/edivorce/apps/core/models.py b/edivorce/apps/core/models.py
index c2fdd01a..09568dd6 100644
--- a/edivorce/apps/core/models.py
+++ b/edivorce/apps/core/models.py
@@ -10,7 +10,7 @@ class BceidUser(models.Model):
     BCeID user table
     """
 
-    user_guid = models.CharField(db_index=True, max_length=200, unique=True, blank=False)
+    user_guid = models.CharField(db_index=True, max_length=32, unique=True, blank=False)
     """ BCEID identifier for user """
 
     date_joined = models.DateTimeField(default=timezone.now)
diff --git a/edivorce/apps/core/templates/base.html b/edivorce/apps/core/templates/base.html
index 269516f4..7e955850 100644
--- a/edivorce/apps/core/templates/base.html
+++ b/edivorce/apps/core/templates/base.html
@@ -52,8 +52,7 @@
                         <div class="top_banner-user">
                             {% if request.bceid_user.is_authenticated %}
                             <span>
-                                {{ request.bceid_user.first_name}}
-                                {{ request.bceid_user.last_name}}
+                                {{ request.bceid_user.display_name}}
                                 &nbsp;&nbsp;|&nbsp;&nbsp; <a href="{% url 'logout' %}">Log out</a>
                             </span>
                             {% endif %}