diff --git a/README.md b/README.md
index 76763b8..527aabf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-FEATURES
+INCLUDED FEATURES
 -------
 * √ - Teacher logs in and creates a "chatter" topic.
 * √ - Teacher distributes a short code for the "chatter" topic to students.
diff --git a/client/views/dashboard/dashboard.html b/client/views/dashboard/dashboard.html
index a393f47..ed2a4c7 100644
--- a/client/views/dashboard/dashboard.html
+++ b/client/views/dashboard/dashboard.html
@@ -1,9 +1,11 @@
 <template name="Dashboard">
+	{{#with currentUser}}
 	<h2>
-		Welcome, {{currentUser.profile.name}}
+		Welcome, {{userName _id}}
 		<a href="{{pathFor 'signOut'}}" class="btn btn-link">Sign out</a>
 	</h2>
-	
+	{{/with}}
+
 	{{#with accountStatus}}
 		<div class="alert alert-warning">Your current account status: <span class="{{styleClass}}">{{label}}</span></div>
 	{{/with}}
diff --git a/packages/login/client/templates.html b/packages/login/client/templates.html
index 46f4388..41b3661 100644
--- a/packages/login/client/templates.html
+++ b/packages/login/client/templates.html
@@ -36,11 +36,13 @@
 			</div>
 		</form>
 		{{else}}
-			<h3 style="font-weight: 300;">Hello, {{userName}}.</h3>
-			<a href="{{pathFor 'signOut'}}">Not {{userName}}? Sign out.</a>
+		{{#with currentUser}}
+			<h3 style="font-weight: 300;">Hello, {{userName _id}}.</h3>
+			<a href="{{pathFor 'signOut'}}">Not {{userName _id}}? Sign out.</a>
 			<div style="margin: 2em 0;">
 				<a href="{{pathFor 'chatters.index'}}" class="btn btn-success">Jump to Chatter Topics</a>
 			</div>
+		{{/with}}
 		{{/unless}}
 	</div>
 </template>