diff --git a/db/smsmapper.php b/db/smsmapper.php
index ae024667..63af4ab2 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -132,10 +132,16 @@ public function getAllPhoneNumbersForFPN ($userId, $phoneNumber, $country) {
 			}
 			$phoneList[$fmtPN][$pn] += 1;
 		}
-		$fpn = PhoneNumberFormatter::format($country, $phoneNumber);
-		if(isset($phoneList[$fpn])){
+		$fpn = $phoneNumber;
+		if(isset($phoneList[$fpn])) {
 			return $phoneList[$fpn];
 		}
+		else {
+			$fpn = PhoneNumberFormatter::format($country, $fpn);
+			if (isset($phoneList[$fpn])) {
+				return $phoneList[$fpn];
+			}
+		}
 		else {
 			return array();
 		}