@@ -878,11 +878,10 @@
 
 /* Protected Authentication Path command */
 #define CACKEY_PIN_COMMAND_DEFAULT_XSTR(str) CACKEY_PIN_COMMAND_DEFAULT_STR(str)
 #define CACKEY_PIN_COMMAND_DEFAULT_STR(str) #str
 static char *cackey_pin_command = NULL;
-static char *cackey_pin_command_xonly = NULL;
 
 /* PCSC Global Handles */
 static LPSCARDCONTEXT cackey_pcsc_handle = NULL;
 
 static unsigned long cackey_getversion(void) {
@@ -4154,26 +4153,25 @@
 
 	/* Define a command to prompt user for a PIN */
 #ifdef CACKEY_PIN_COMMAND_DEFAULT
 	cackey_pin_command = CACKEY_PIN_COMMAND_DEFAULT_XSTR(CACKEY_PIN_COMMAND_DEFAULT);
 #endif
+
 #ifdef CACKEY_PIN_COMMAND_XONLY_DEFAULT
-	cackey_pin_command_xonly = CACKEY_PIN_COMMAND_DEFAULT_XSTR(CACKEY_PIN_COMMAND_XONLY_DEFAULT);
+	if (getenv("DISPLAY") != NULL) {
+		cackey_pin_command = CACKEY_PIN_COMMAND_DEFAULT_XSTR(CACKEY_PIN_COMMAND_XONLY_DEFAULT);
+	}
 #endif
 
-	if (getenv("DISPLAY") != NULL) {
-		cackey_pin_command = cackey_pin_command_xonly;
+	if (getenv("CACKEY_PIN_COMMAND") != NULL) {
+		cackey_pin_command = getenv("CACKEY_PIN_COMMAND");
 	}
 
 	if (getenv("CACKEY_PIN_COMMAND_XONLY") != NULL && getenv("DISPLAY") != NULL) {
 		cackey_pin_command = getenv("CACKEY_PIN_COMMAND_XONLY");
 	}
 
-	if (getenv("CACKEY_PIN_COMMAND") != NULL) {
-		cackey_pin_command = getenv("CACKEY_PIN_COMMAND");
-	}
-
 	CACKEY_DEBUG_PRINTF("Returning CKR_OK (%i)", CKR_OK);
 
 	return(CKR_OK);
 }