diff --git a/submodules/users/users.js b/submodules/users/users.js
index d0f23be..16f14b3 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1831,20 +1831,13 @@ define(function(require) {
 			var self = this;
 
 			if (user.presence_id) {
-				var found = false,
-					formattedPresenceID = '' + user.presence_id;
+				var formattedPresenceID = '' + user.presence_id;
 
-				_.each(listNumbers, function(number) {
-					if (number === formattedPresenceID) {
-						found = true;
-					}
+				return _.some(listNumbers, function(number) {
+					return number === formattedPresenceID;
 				});
-
-				return found;
-			} else if (listNumbers.length) {
-				return false;
 			} else {
-				return true;
+				return _.isEmpty(listNumbers);
 			}
 		},
 
diff --git a/submodules/users/views/changePresenceIDPopup.html b/submodules/users/views/changePresenceIDPopup.html
index cf34e47..1eec87c 100644
--- a/submodules/users/views/changePresenceIDPopup.html
+++ b/submodules/users/views/changePresenceIDPopup.html
@@ -4,10 +4,10 @@
 	</div>
 
 	<div class="list-choices">
-		{{#each numbers}} 
-			<div class="presence-id-option" data-number="{{this}}">{{ formatPhoneNumber this }}</div>
+		{{#each numbers}}
+			<div class="presence-id-option{{#if @first}} active{{/if}}" data-number="{{this}}">{{ formatPhoneNumber this }}</div>
 		{{/each}}
-		<div class="presence-id-option" data-number="none"> 
+		<div class="presence-id-option{{#unless numbers.length}} active{{/unless}}" data-number="none">
 			{{ i18n.users.presenceIDPopup.none}}
 		</div>
 	</div>
@@ -18,4 +18,4 @@
 			<button type="button" class="monster-button monster-button-success save-presence-id">{{ i18n.saveChanges }}</button>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>