diff --git a/db/configmapper.php b/db/configmapper.php
index d4af5cd..3a7ddbc 100644
--- a/db/configmapper.php
+++ b/db/configmapper.php
@@ -49,6 +49,7 @@ class ConfigMapper extends Mapper {
 		try {
 			$sql = "SELECT `key` FROM `*PREFIX*ocsms_config` WHERE `key` = ? AND `user` = ?";
 			$this->findEntity($sql, array($key, $this->user));
+
 			return true;
 		} catch (DoesNotExistException $e){
 			return false;
diff --git a/js/script.js b/js/script.js
index a6797ef..5295fad 100644
--- a/js/script.js
+++ b/js/script.js
@@ -116,7 +116,7 @@ var checkNewMessages = function() {
 					if (typeof jsondata['photos'][peerLabel] != 'undefined') {
 						peerListBuf += 'style="background-image: url(' + jsondata['photos'][peerLabel] + ');"';
 					}
-					peerListBuf += '></div><a href="#" ng-click="loadConversation();" mailbox-navigation="' + idxVal2 + '" style="font-weight: bold;" mailbox-label="' + peerLabel + '">' + peerLabel + ' (' + val + ')</a></li>';
+					peerListBuf += '></div><a href="#" ng-click="ctCtl.loadConversation();" mailbox-navigation="' + idxVal2 + '" style="font-weight: bold;" mailbox-label="' + peerLabel + '">' + peerLabel + ' (' + val + ')</a></li>';
 					$('#app-mailbox-peers ul').prepend(peerListBuf);
 					bufferedContacts.push(peerLabel);
 
@@ -320,7 +320,7 @@ function fetchInitialPeerList(jsondata) {
 			if (typeof jsondata['photos'][peerLabel] != 'undefined') {
 				peerListBuf += 'style="background-image: url(' + jsondata['photos'][peerLabel] + ');"';
 			}
-			peerListBuf += '></div><a href="#" ng-click="loadConversation();" mailbox-navigation="' + idxVal2 + '" mailbox-label="' + peerLabel + '">' + peerLabel + '</a></li>';
+			peerListBuf += '></div><a href="#" ng-click="ctCtl.loadConversation();" mailbox-navigation="' + idxVal2 + '" mailbox-label="' + peerLabel + '">' + peerLabel + '</a></li>';
 			bufferedContacts.push(peerLabel);
 		}
 	});
diff --git a/templates/main.php b/templates/main.php
index e1bd695..f562036 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -9,7 +9,7 @@ use \OCA\OcSms\Lib\CountryCodes;
 
 <div class="ng-scope" id="app" ng-app="OcSms">
 	<div id="app-mailbox-peers">
-		<ul ng-controller="ContactsController">
+		<ul>
 			<li><div id="ocsms-empty-peers">There isn't any conversation</div></li>
 		</ul>
 	</div>