diff --git a/install.ins b/install.ins
index fbf4197..33e657a 100644
--- a/install.ins
+++ b/install.ins
@@ -17,19 +17,19 @@ Sub_HandleExitCode
 [Sub_GetProperties]
 Set $Version$ = GetValue("productversion", GetProductMap)
 Set $CreateContextMenuEntry$ = GetProductProperty("contextmenuentry", "false")
-Set $DesktopShortcutArgument$ = GetProductProperty("desktopshortcut", "false")
+Set $CreateDesktopShortcut$ = GetProductProperty("desktopshortcut", "false")
 
 [Sub_ConfigureProperties]
-if ($CreateContextMenuEntry$)
-  Set $ContextMenuArguments$ = ", !addcontextmenufiles, !addcontextmenufolders"
+if ($CreateContextMenuEntry$ = "true")
+  Set $ContextMenuArguments$ = ", addcontextmenufiles, addcontextmenufolders"
 else
-  Set $ContextMenuArguments$ = ""
+  Set $ContextMenuArguments$ = ", !addcontextmenufiles, !addcontextmenufolders"
 endif
 
-if ($CreateDesktopShortcut$)
-  Set $DesktopShortcutArgument$ = ", !desktopicon"
+if ($CreateDesktopShortcut$ = "true")
+  Set $DesktopShortcutArgument$ = ", desktopicon"
 else
-  Set $DesktopShortcutArgument$ = ""
+  Set $DesktopShortcutArgument$ = ", !desktopicon"
 endif
 
 [WinBatch_Setup]