diff --git a/include/freerdp/settings_types.h b/include/freerdp/settings_types.h
index 3e90c1306..c986db725 100644
--- a/include/freerdp/settings_types.h
+++ b/include/freerdp/settings_types.h
@@ -300,12 +300,14 @@ extern "C"
 	} TARGET_NET_ADDRESS;
 
 /* Logon Error Info */
+#define LOGON_MSG_SESSION_BUSY_OPTIONS 0xFFFFFFF8
 #define LOGON_MSG_DISCONNECT_REFUSED 0xFFFFFFF9
 #define LOGON_MSG_NO_PERMISSION 0xFFFFFFFA
 #define LOGON_MSG_BUMP_OPTIONS 0xFFFFFFFB
 #define LOGON_MSG_RECONNECT_OPTIONS 0xFFFFFFFC
 #define LOGON_MSG_SESSION_TERMINATE 0xFFFFFFFD
 #define LOGON_MSG_SESSION_CONTINUE 0xFFFFFFFE
+#define ERROR_CODE_ACCESS_DENIED 0xFFFFFFFF
 
 #define LOGON_FAILED_BAD_PASSWORD 0x00000000
 #define LOGON_FAILED_UPDATE_PASSWORD 0x00000001
@@ -328,14 +330,14 @@ extern "C"
 #define PACKET_COMPR_TYPE_RDP61 0x03
 #define PACKET_COMPR_TYPE_RDP8 0x04
 
-/* Desktop Rotation Flags */
-enum FreeRDP_DesktopRotationFlags
-{
-	ORIENTATION_LANDSCAPE = 0,
-	ORIENTATION_PORTRAIT = 90,
-	ORIENTATION_LANDSCAPE_FLIPPED = 180,
-	ORIENTATION_PORTRAIT_FLIPPED = 270
-};
+	/* Desktop Rotation Flags */
+	enum FreeRDP_DesktopRotationFlags
+	{
+		ORIENTATION_LANDSCAPE = 0,
+		ORIENTATION_PORTRAIT = 90,
+		ORIENTATION_LANDSCAPE_FLIPPED = 180,
+		ORIENTATION_PORTRAIT_FLIPPED = 270
+	};
 
 /* Clipboard feature mask */
 #define CLIPRDR_FLAG_LOCAL_TO_REMOTE 0x01
diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c
index 831a5bbf8..40e8a4ee6 100644
--- a/libfreerdp/core/freerdp.c
+++ b/libfreerdp/core/freerdp.c
@@ -1189,29 +1189,24 @@ const char* freerdp_get_logon_error_info_type_ex(UINT32 type, char* buffer, size
 
 const char* freerdp_get_logon_error_info_type(UINT32 type)
 {
+#define CASE_ENTRY(x) \
+	case x:           \
+		return #x
 	switch (type)
 	{
-		case LOGON_MSG_DISCONNECT_REFUSED:
-			return "LOGON_MSG_DISCONNECT_REFUSED";
-
-		case LOGON_MSG_NO_PERMISSION:
-			return "LOGON_MSG_NO_PERMISSION";
-
-		case LOGON_MSG_BUMP_OPTIONS:
-			return "LOGON_MSG_BUMP_OPTIONS";
-
-		case LOGON_MSG_RECONNECT_OPTIONS:
-			return "LOGON_MSG_RECONNECT_OPTIONS";
-
-		case LOGON_MSG_SESSION_TERMINATE:
-			return "LOGON_MSG_SESSION_TERMINATE";
-
-		case LOGON_MSG_SESSION_CONTINUE:
-			return "LOGON_MSG_SESSION_CONTINUE";
+		CASE_ENTRY(LOGON_MSG_SESSION_BUSY_OPTIONS);
+		CASE_ENTRY(LOGON_MSG_DISCONNECT_REFUSED);
+		CASE_ENTRY(LOGON_MSG_NO_PERMISSION);
+		CASE_ENTRY(LOGON_MSG_BUMP_OPTIONS);
+		CASE_ENTRY(LOGON_MSG_RECONNECT_OPTIONS);
+		CASE_ENTRY(LOGON_MSG_SESSION_TERMINATE);
+		CASE_ENTRY(LOGON_MSG_SESSION_CONTINUE);
+		CASE_ENTRY(ERROR_CODE_ACCESS_DENIED);
 
 		default:
 			return "UNKNOWN";
 	}
+#undef CASE_ENTRY
 }
 
 const char* freerdp_get_logon_error_info_data(UINT32 data)