Merged PR 5640: Add instructions to disable auto sign-in for kiosk

windows/configuration/change-history-for-configure-windows-10.md

@@ -8,7 +8,7 @@ ms.sitesec: library
 ms.pagetype: security
 ms.localizationpriority: high
 author: jdeckerms
-ms.date: 01/26/2018
+ms.date: 01/31/2018
 ---
 
 # Change history for Configure Windows 10
@@ -26,6 +26,8 @@ New or changed topic | Description
 [Configure Windows 10 taskbar](configure-windows-10-taskbar.md) | Added section for removing default apps from the taskbar.
 [Manage Windows 10 connection endpoints](manage-windows-endpoints-version-1709.md) | New topic for Windows 10, version 1709 that explains the purpose for connections to Microsoft services and how to manage them.  
 [Configure Windows Spotlight on the lock screen](windows-spotlight.md) | Added section for resolution of custom lock screen images.
+[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md) | Added section for automatic sign-in after restart on unmanaged devices.
+
 
 ## November 2017
 

windows/configuration/lock-down-windows-10-to-specific-apps.md

@@ -9,7 +9,7 @@ ms.sitesec: library
 ms.pagetype: edu, security
 author: jdeckerms
 ms.localizationpriority: high
-ms.date: 11/26/2018
+ms.date: 01/31/2018
 ms.author: jdecker
 ---
 
@@ -52,6 +52,7 @@ If you don't want to use a provisioning package, you can deploy the configuratio
 - The kiosk device must be running Windows 10 (S, Pro, Enterprise, or Education), version 1709
 
 
+
 ## Create XML file
 
 Let's start by looking at the basic structure of the XML file. 

windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md

@@ -8,7 +8,7 @@ ms.mktglfcycl: manage
 ms.sitesec: library
 author: jdeckerms
 ms.localizationpriority: high
-ms.date: 10/16/2017
+ms.date: 01/31/2018
 ---
 
 # Set up a kiosk on Windows 10 Pro, Enterprise, or Education
@@ -37,9 +37,15 @@ To return the device to the regular shell, see [Sign out of assigned access](#si
 >[!NOTE]
 >A Universal Windows app is built on the Universal Windows Platform (UWP), which was first introduced in Windows 8 as the Windows Runtime. A Classic Windows application uses the Classic Windows Platform (CWP) (e.g., COM, Win32, WPF, WinForms, etc.) and is typically launched using an .EXE or .DLL file.
 
- 
+## Using a local device as a kiosk
 
+When your kiosk is a local device that is not managed by Active Directory or Azure Active Directory, there is a default setting that enables automatic sign-in after a restart. That means that when the device restarts, the last signed-in user will be signed in automatically. If the last signed-in user is the kiosk account, the kiosk app will be launched automatically after the device restarts.
 
+If you want the kiosk account signed in automatically and the kiosk app launched when the device restarts, there is nothing you need to do.
+
+If you do not want the kiosk account signed in automatically when the device restarts, you must change the default setting before you configure the device as a kiosk. Sign in with the account that you will assign as the kiosk account, go to **Settings** > **Accounts** > **Sign-in options**, and toggle the **Use my sign-in info to automatically finish setting up my device after an update or restart** setting to **Off**. After you change the setting, you can apply the kiosk configuration to the device.
+
+![Screenshot of automatic sign-in setting](images/auto-signin.png)
 
 <span id="wizard" />
 ## Set up a kiosk using Windows Configuration Designer