diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index ce876cca2d..5828aa5c93 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -2,7 +2,10 @@
 <Package
    xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
    xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
+   xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
+   xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+   IgnorableNamespaces="uap uap2 uap3 rescap">
   <Identity Name="TelegramDesktop"
     ProcessorArchitecture="x64"
     Publisher="CN=Telegram Messenger LLP, O=Telegram Messenger LLP, L=London, C=GB"
@@ -31,9 +34,9 @@
        Square44x44Logo="Assets\logo44\logo44.png"
        Description="Telegram Desktop official messenger" />
       <Extensions>
-        <uap:Extension Category="windows.protocol" Executable="Telegram.exe">
-          <uap:Protocol Name="tg" />
-        </uap:Extension>
+        <uap3:Extension Category="windows.protocol">
+          <uap3:Protocol Name="tg" Parameters="-- &quot;%1&quot;" />
+        </uap3:Extension>
       </Extensions>
     </Application>
   </Applications>
diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat
index 53477da92b..168d8cf4fb 100644
--- a/Telegram/build/build.bat
+++ b/Telegram/build/build.bat
@@ -70,33 +70,31 @@ if not exist %FinalReleasePath% (
   exit /b 1
 )
 
-if %BetaVersion% neq 0 (
-  if %BuildUWP% neq 0 (
-    echo Can not build UWP version from a closed beta!
+if %BuildUWP% neq 0 (
+  if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\AppX\ (
+    echo UWP deploy folder for version %AppVersionStr% already exists!
     exit /b 1
   )
-  if exist %DeployPath%\ (
-    echo Deploy folder for version %AppVersionStr% already exists!
+  if exist %ReleasePath%\AppX\ (
+    echo Result folder out\Release\AppX already exists!
     exit /b 1
   )
-  if exist %ReleasePath%\%BetaKeyFile% (
-    echo Beta version key file for version %AppVersion% already exists!
-    exit /b 1
-  )
-) else (
-  if %BuildUWP% neq 0 (
-    if "%AlphaBetaParam%" neq "" (
-      echo Can not build UWP version from an alpha!
-      exit /b 1
-    )
-    if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\AppX\ (
-      echo UWP deploy folder for version %AppVersionStr% already exists!
-      exit /b 1
-    )
+  if "%AlphaBetaParam%" equ "" (
     if not exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%\ (
       echo Deploy folder for version %AppVersionStr% does not exist!
       exit /b 1
     )
+  )
+) else (
+  if %BetaVersion% neq 0 (
+    if exist %DeployPath%\ (
+      echo Deploy folder for version %AppVersionStr% already exists!
+      exit /b 1
+    )
+    if exist %ReleasePath%\%BetaKeyFile% (
+      echo Beta version key file for version %AppVersion% already exists!
+      exit /b 1
+    )
   ) else (
     if exist %ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStr%.alpha\ (
       echo Deploy folder for version %AppVersionStr%.alpha already exists!
@@ -198,22 +196,28 @@ echo Done!
 if %BuildUWP% neq 0 (
   cd "%HomePath%"
 
-  mkdir "%DeployPath%\AppX"
-  xcopy /e "Resources\uwp\AppX\*" "%DeployPath%\AppX\"
+  mkdir "%ReleasePath%\AppX"
+  xcopy /e "Resources\uwp\AppX\*" "%ReleasePath%\AppX\"
 
-  makepri new /pr Resources\uwp\AppX\ /cf Resources\uwp\priconfig.xml /mn %DeployPath%\AppX\AppxManifest.xml /of %DeployPath%\AppX\resources.pri
+  makepri new /pr Resources\uwp\AppX\ /cf Resources\uwp\priconfig.xml /mn %ReleasePath%\AppX\AppxManifest.xml /of %ReleasePath%\AppX\resources.pri
   if %errorlevel% neq 0 goto error
 
-  move "%ReleasePath%\%BinaryName%.exe" "%DeployPath%\AppX\"
+  move "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\AppX\"
 
-  MakeAppx.exe pack /d "%DeployPath%\AppX" /l /p ..\out\Release\%BinaryName%.appx
+  MakeAppx.exe pack /d "%ReleasePath%\AppX" /l /p ..\out\Release\%BinaryName%.appx
   if %errorlevel% neq 0 goto error
 
   call "%SignAppxPath%" "..\out\Release\%BinaryName%.appx"
 
-  xcopy "%ReleasePath%\%BinaryName%.pdb" "%DeployPath%\AppX\"
-  move "%ReleasePath%\%BinaryName%.exe.pdb" "%DeployPath%\AppX\"
-  move "%ReleasePath%\%BinaryName%.appx" "%DeployPath%\AppX\"
+  xcopy "%ReleasePath%\%BinaryName%.pdb" "%ReleasePath%\AppX\"
+  move "%ReleasePath%\%BinaryName%.exe.pdb" "%ReleasePath%\AppX\"
+  move "%ReleasePath%\%BinaryName%.appx" "%ReleasePath%\AppX\"
+
+  if "%AlphaBetaParam%" equ "" (
+    move "%ReleasePath%\AppX" "%DeployPath%\"
+  ) else (
+    echo Leaving result in out\Release\AppX for now..
+  )
 ) else (
   if not exist "%ReleasePath%\deploy" mkdir "%ReleasePath%\deploy"
   if not exist "%ReleasePath%\deploy\%AppVersionStrMajor%" mkdir "%ReleasePath%\deploy\%AppVersionStrMajor%"