diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 937b45ab2d..bc96971698 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,7 +4,7 @@
 
 /BotProject/ @boydc2014 @luhan2017
 
-/Composer/ @cwhitten @boydc2014 @a-b-r-o-w-n @corinagum @beyackle @srinaath
+/Composer/ @cwhitten @boydc2014 @a-b-r-o-w-n @corinagum @beyackle @srinaath @tonyanziano
 
 /Composer/packages/extensions/visual-designer @yeze322 @cwhitten @boydc2014 @a-b-r-o-w-n
 
diff --git a/Composer/packages/electron-server/electron-builder-config.json b/Composer/packages/electron-server/electron-builder-config.json
index 2183ff21cf..85ccb49db1 100644
--- a/Composer/packages/electron-server/electron-builder-config.json
+++ b/Composer/packages/electron-server/electron-builder-config.json
@@ -32,6 +32,7 @@
       {
         "target": "nsis",
         "arch": [
+          "ia32",
           "x64"
         ]
       }
@@ -40,15 +41,18 @@
     "artifactName": "BotFramework-Composer-${version}-windows-setup.${ext}"
   },
   "nsis": {
+    "include": "resources/installer.nsh",
     "perMachine": false,
     "allowElevation": true,
     "allowToChangeInstallationDirectory": true,
     "packElevateHelper": true,
     "unicode": true,
     "runAfterFinish": true,
+    "installerIcon": "resources/composerIcon.ico",
+    "uninstallerIcon": "resources/composerIcon.ico",
     "createDesktopShortcut": true,
     "createStartMenuShortcut": true,
-    "shortcutName": "Bot Framework Composer (preview)",
+    "shortcutName": "Bot Framework Composer",
     "oneClick": false
   },
   "linux": {
diff --git a/Composer/packages/electron-server/resources/installer.nsh b/Composer/packages/electron-server/resources/installer.nsh
new file mode 100644
index 0000000000..453668e176
--- /dev/null
+++ b/Composer/packages/electron-server/resources/installer.nsh
@@ -0,0 +1,15 @@
+!macro customInstall
+  DetailPrint "Register bfcomposer URI Handler"
+  DeleteRegKey HKCU "SOFTWARE\Classes\bfcomposer"
+  WriteRegStr HKCU "SOFTWARE\Classes\bfcomposer" "" "URL:Bot Framework Composer"
+  WriteRegStr HKCU "SOFTWARE\Classes\bfcomposer" "URL Protocol" ""
+  WriteRegStr HKCU "SOFTWARE\Classes\bfcomposer\DefaultIcon" "" "$INSTDIR\${APP_EXECUTABLE_FILENAME},1"
+  WriteRegStr HKCU "SOFTWARE\Classes\bfcomposer\shell" "" ""
+  WriteRegStr HKCU "SOFTWARE\Classes\bfcomposer\shell\open" "" ""
+  WriteRegStr HKCU "SOFTWARE\Classes\bfcomposer\shell\open\command" "" `"$INSTDIR\${APP_EXECUTABLE_FILENAME}" "%1"`
+!macroend
+
+!macro customUninstall
+  DetailPrint "Unregister bfcomposer URI Handler"
+  DeleteRegKey HKCU "SOFTWARE\Classes\bfcomposer"
+!macroend
diff --git a/Composer/packages/electron-server/src/main.ts b/Composer/packages/electron-server/src/main.ts
index 7ac5e299dc..7c1dc07195 100644
--- a/Composer/packages/electron-server/src/main.ts
+++ b/Composer/packages/electron-server/src/main.ts
@@ -29,7 +29,7 @@ const getBaseUrl = () => {
   if (!serverPort) {
     throw new Error('getBaseUrl() called before serverPort is defined.');
   }
-  return `http://localhost:${serverPort}`;
+  return `http://localhost:${serverPort}/`;
 };
 
 function processArgsForWindows(args: string[]): string {