diff --git a/pokecli.py b/pokecli.py
index 4d8eef1737..0c7f672267 100644
--- a/pokecli.py
+++ b/pokecli.py
@@ -416,6 +416,14 @@ def _json_loader(filename):
         help="Username",
         default=None
     )
+    add_config(
+        parser,
+        load,
+        short_flag="-hp",
+        long_flag="--hashendpoint",
+        help="hashendpoint",
+        default=None
+    )
     add_config(
         parser,
         load,
diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py
index 2596b741d9..62d094b66e 100644
--- a/pokemongo_bot/__init__.py
+++ b/pokemongo_bot/__init__.py
@@ -139,6 +139,10 @@ def __init__(self, db, config):
         self.inventory_refresh_threshold = 10
         self.inventory_refresh_counter = 0
         self.last_inventory_refresh = time.time()
+        
+        # Allow user to change hash service
+        if self.config.hashendpoint:
+            HashServer.endpoint = self.config.hashendpoint
 
         # Catch on/off
         self.catch_disabled = False