diff --git a/app/authentication/auth.py b/app/authentication/auth.py
index b6dd4d5d7..3925e588f 100644
--- a/app/authentication/auth.py
+++ b/app/authentication/auth.py
@@ -47,44 +47,48 @@ def requires_no_auth():
 
 def check_route_secret():
     # Check route of inbound sms (Experimental)
-    # Temporary custom header for route security
+    # Custom header for route security
+    auth_error_msg = ''
     if request.headers.get("X-Custom-Forwarder"):
         route_secret_key = request.headers.get("X-Custom-Forwarder")
 
         if route_secret_key is None:
             # Not blocking at the moment
             # raise AuthError('invalid secret key', 403)
-            return
+            auth_error_msg = auth_error_msg + 'invalid secret key, '
+        else:
 
-        key_1 = current_app.config.get('ROUTE_SECRET_KEY_1')
-        key_2 = current_app.config.get('ROUTE_SECRET_KEY_2')
+            key_1 = current_app.config.get('ROUTE_SECRET_KEY_1')
+            key_2 = current_app.config.get('ROUTE_SECRET_KEY_2')
 
-        if key_1 == '' and key_2 == '':
-            # Not blocking at the moment
-            # raise AuthError('X-Custom-Forwarder, no secret was set on server', 503)
-            return
+            if key_1 == '' and key_2 == '':
+                # Not blocking at the moment
+                # raise AuthError('X-Custom-Forwarder, no secret was set on server', 503)
+                auth_error_msg = auth_error_msg + 'no secret was set on server, '
+            else:
 
-        key_used = None
-        route_allowed = False
-        if route_secret_key == key_1:
-            key_used = 1
-            route_allowed = True
-        elif route_secret_key == key_2:
-            key_used = 2
-            route_allowed = True
+                key_used = None
+                route_allowed = False
+                if route_secret_key == key_1:
+                    key_used = 1
+                    route_allowed = True
+                elif route_secret_key == key_2:
+                    key_used = 2
+                    route_allowed = True
+
+                if not key_used:
+                    # Not blocking at the moment
+                    # raise AuthError('X-Custom-Forwarder, wrong secret', 403)
+                    auth_error_msg = auth_error_msg + 'wrong secret'
 
         current_app.logger.info({
-            'message': 'X-Custom-Forwarder key {} is used'.format(key_used),
+            'message': 'X-Custom-Forwarder',
             'log_contents': {
                 'passed': route_allowed,
+                'key_used': key_used,
+                'error': auth_error_msg
             }
         })
-
-        if not key_used:
-            # Not blocking at the moment
-            # raise AuthError('X-Custom-Forwarder, wrong secret', 403)
-            return
-
         return jsonify(key_used=key_used), 200