diff --git a/i18n/en-US.json b/i18n/en-US.json
index 369b56f..68c6514 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -491,7 +491,7 @@
 			"calls": "Incoming Call Handling"
 		},
 		"noNumberTitle": "Add Main Number",
-		"noNumberMessage": "Please add a main number to continue.",
+		"noNumberMessage": "Please add or buy a number from the links below to continue.",
 		"noConfNumMessage": "Please add a main conference number.",
 		"numberLinks": {
 			"spare": "Add from Spare Numbers",
@@ -697,6 +697,7 @@
 			"emergencyHelp2": "Note: You can set this feature on users' numbers too if they do not share the same location as above.",
 			"mandatoryE911Alert": "You must specify e911 information for your company caller ID number."
 		},
+		"missingMainNumberForCallerId": "You need to add a main number to your office before configuring the Caller-ID!",
 		"missingE911Message": "Please setup your Company Caller ID and e911 on a Main Number.",
 		"missingMainNumberMessage": "Please add a Main Number to your account.",
 		"totalUsers": "Total Users",
diff --git a/i18n/fr-FR.json b/i18n/fr-FR.json
index 6e96301..3c4f26d 100644
--- a/i18n/fr-FR.json
+++ b/i18n/fr-FR.json
@@ -676,6 +676,7 @@
 			"emergencyHelp2": "Note: Vous pouvez ajouter cette fonctionnalité sur chaque utilisateur si cette adresse ne leur correspond pas.",
 			"mandatoryE911Alert": "Vous devez spécifier les infos E911 pour le Caller-ID de ce numéro d'entreprise."
 		},
+		"missingMainNumberForCallerId": "Veuillez ajouter un Numéro principal à votre compte avant de configurer le Caller-ID de votre compte!",
 		"missingE911Message": "Veuillez configurer le Caller-ID et l'E911 sur un de vos numéros principaux.",
 		"missingMainNumberMessage": "Veuillez ajouter un Numéro principal à votre compte.",
 		"totalUsers": "Utilisateurs",
diff --git a/submodules/myOffice/myOffice.css b/submodules/myOffice/myOffice.css
index e219cf0..97162f4 100644
--- a/submodules/myOffice/myOffice.css
+++ b/submodules/myOffice/myOffice.css
@@ -30,7 +30,15 @@
 	padding: 5px 0px;
 	text-align: center;
 }
-#myoffice_container .dashboard-header .header-link:hover {
+
+#myoffice_container .dashboard-header .header-link.disabled {
+	background: #333;
+	cursor: not-allowed;
+	text-decoration: none;
+	opacity: 0.5;
+}
+
+#myoffice_container .dashboard-header .header-link:not(.disabled):hover {
 	box-shadow: 0px 0px 20px #666 inset;
 	border-radius: 4px;
 	text-decoration: none;
diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js
index 076e7f4..4dc2dfe 100644
--- a/submodules/myOffice/myOffice.js
+++ b/submodules/myOffice/myOffice.js
@@ -526,7 +526,7 @@ define(function(require){
 				});
 			});
 
-			template.find('.header-link.caller-id').on('click', function(e) {
+			template.find('.header-link.caller-id:not(.disabled)').on('click', function(e) {
 				e.preventDefault();
 				self.myOfficeRenderCallerIdPopup({
 					parent: parent,
@@ -534,6 +534,10 @@ define(function(require){
 				});
 			});
 
+			template.find('.header-link.caller-id.disabled').on('click', function(e) {
+				monster.ui.alert(self.i18n.active().myOffice.missingMainNumberForCallerId);
+			});
+
 			template.find('[data-toggle="tooltip"]').tooltip();
 		},
 
diff --git a/views/myOffice-layout.html b/views/myOffice-layout.html
index 712e39e..0bbc154 100644
--- a/views/myOffice-layout.html
+++ b/views/myOffice-layout.html
@@ -1,7 +1,7 @@
 <div id="myoffice_container">
 	<div class="dashboard-header">
-		<div class="header-title">{{account.name}}</div>
-		<a href="#" class="header-link caller-id">
+		<div class="header-title">{{account.name}}</div>{{debug mainNumbers.length}}
+		<a href="#" class="header-link caller-id{{#compare mainNumbers.length "===" 0}} disabled{{/compare}}">
 			<div class="header-link-icon"><i class="icon-white icon-large icon-user"></i></div>
 			<div class="header-link-title">{{i18n.myOffice.topBarLinks.callerID}}</div>
 		</a>