diff --git a/resources/lib/UserClient.py b/resources/lib/UserClient.py
index 2fed9e24..425647ce 100644
--- a/resources/lib/UserClient.py
+++ b/resources/lib/UserClient.py
@@ -199,20 +199,30 @@ class UserClient(threading.Thread):
         for user in users:
             name = user.get("Name")
             userHasPassword = False
+            userHasPin = False
             if (username == name):
                 # Verify if user has a password
                 if (user.get("HasPassword") == True):
                     userHasPassword = True
+                    # Verify if user enabled easy pin and enabled it's use
+                    if (user.get("HasConfiguredEasyPassword") == True) and (user.get("Configuration")["EnableLocalPassword"] == True):
+                        userHasPin = True
                 # If user has password
-                if (userHasPassword):
+                if (userHasPassword) and (userHasPin == False):
                     password = xbmcgui.Dialog().input("Enter password for user: %s" % username, option=xbmcgui.ALPHANUM_HIDE_INPUT)
                     # If password dialog is cancelled
                     if password == "":
                         self.logMsg("No password entered.", 0)
-                        #addon.setSetting("username", "")
                         self.WINDOW.setProperty("Server_status", "Stop")
                         self.auth = False
-                        #self.WINDOW.setProperty("Server_status", "")
+                        return
+                elif (userHasPassword) and (userHasPin):
+                    password = xbmcgui.Dialog().input("Enter easy pin for user: %s" % username, type=xbmcgui.INPUT_NUMERIC)
+                    # If password dialog is cancelled
+                    if password == "":
+                        self.logMsg("No password entered.", 0)
+                        self.WINDOW.setProperty("Server_status", "Stop")
+                        self.auth = False
                         return
                 break
         else: