diff --git a/js/script.js b/js/script.js
index 682c263..ebf733f 100644
--- a/js/script.js
+++ b/js/script.js
@@ -86,7 +86,7 @@ function fetchConversation(phoneNumber) {
 
 			conversationBuf = formatConversation(jsondata)[1];
 			conversationBuf += '<div class="msg-endtag"></div>';
-			if (typeof jsondata['contactName'] == 'undefined') {
+			if (typeof jsondata['contactName'] == 'undefined' || jsondata['contactName'] == '') {
 				$('#ocsms-phone-label').html(phoneNumberLabel);
 				curContactName = phoneNumberLabel;
 				$('#ocsms-phone-opt-number').html('');
diff --git a/templates/main.php b/templates/main.php
index a0dfd9a..0fc806d 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -13,6 +13,7 @@
 		<div id="app-content-header" style="display: none;">	
 			<div id="ocsms-phone-label"></div>
 			<div id="ocsms-phone-opt-number"></div>
+			
 		</div>
 		<div id="app-content-wrapper">
 			<div id="ocsms-empty-conversation">Please choose a conversation on the left menu</div>