diff --git a/src/main/resources/config/sql/base/V2__insert_data_v1_0.sql b/src/main/resources/config/sql/base/V2__insert_data_v1_0.sql
index d4f1eccb..afa5bbee 100644
--- a/src/main/resources/config/sql/base/V2__insert_data_v1_0.sql
+++ b/src/main/resources/config/sql/base/V2__insert_data_v1_0.sql
@@ -82,6 +82,8 @@ INSERT INTO configuration_attribute VALUES
     (65, 'allowPDFPlugIn', 'CHECKBOX', null, null, null, null, 'true'),
     (66, 'downloadAndOpenSebConfig', 'CHECKBOX', null, null, null, null, 'true'),
     
+    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'true'),
+    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'true'),
     (67, 'quitURL', 'TEXT_FIELD', null, null, null, null, null),
     (68, 'quitURLConfirm', 'CHECKBOX', null, null, null, null, 'true'),
     (69, 'restartExamUseStartURL', 'CHECKBOX', null, null, null, null, 'false'),
@@ -234,8 +236,6 @@ INSERT INTO configuration_attribute VALUES
     (812, 'allowWlan', 'CHECKBOX', null, null, null, null, 'false'),
     (813, 'hookKeys', 'CHECKBOX', null, null, null, null, 'true'),
     
-    (900, 'examSessionClearCookiesOnEnd', 'CHECKBOX', null, null, null, null, 'true'),
-    (901, 'examSessionClearCookiesOnStart', 'CHECKBOX', null, null, null, null, 'true'),
     (902, 'showBackToStartButton', 'CHECKBOX', null, null, null, null, 'true'),
     (903, 'showSettingsInApp', 'CHECKBOX', null, null, null, null, 'false'),
     (904, 'browserUserAgentWinTouchModeIPad', 'TEXT_FIELD', null, null, null, null, 'Mozilla/5.0 (iPad; CPU OS 12_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1'),
@@ -292,9 +292,10 @@ INSERT INTO orientation VALUES
     (15, 15, 0, 2, 'wintoolbar', 0, 7, 3, 1, 'NONE'),
     (16, 16, 0, 2, 'taskbar', 0, 9, 3, 1, 'NONE'),
     (17, 17, 0, 2, 'taskbar', 5, 9, 2, 1, 'LEFT_SPAN'),
-    (18, 18, 0, 2, 'taskbar', 0, 10, 3, 1, 'NONE'),
-    (19, 19, 0, 2, 'taskbar', 0, 11, 3, 1, 'NONE'),
-    (20, 20, 0, 2, 'taskbar', 0, 12, 3, 1, 'NONE'),
+    (812, 812, 0, 2, 'taskbar', 0, 10, 3, 1, 'NONE'),
+    (18, 18, 0, 2, 'taskbar', 0, 11, 3, 1, 'NONE'),
+    (19, 19, 0, 2, 'taskbar', 0, 12, 3, 1, 'NONE'),
+    (20, 20, 0, 2, 'taskbar', 0, 13, 3, 1, 'NONE'),
     (21, 21, 0, 2, 'zoom', 0, 14, 3, 1, 'NONE'),
     (22, 22, 0, 2, 'zoom', 0, 15, 3, 1, 'NONE'),
     (23, 23, 0, 2, 'zoomMode', 3, 14, 4, 1, 'NONE'),
@@ -345,12 +346,16 @@ INSERT INTO orientation VALUES
     (65, 65, 0, 4, null, 0, 9, 8, 1, 'NONE'),
     (66, 66, 0, 4, null, 0, 10, 8, 1, 'NONE'),
     
-    (67, 67, 0, 5, 'quitLink', 0, 1, 8, 1, 'TOP'),
-    (68, 68, 0, 5, 'quitLink', 0, 2, 8, 1, 'NONE'),    
-    (69, 69, 0, 5, 'backToStart', 0, 4, 8, 1, 'NONE'),
-    (70, 70, 0, 5, 'backToStart', 0, 6, 8, 2, 'TOP'),
-    (71, 71, 0, 5, 'backToStart', 0, 8, 8, 2, 'TOP'),
-    (72, 72, 0, 5, 'backToStart', 0, 10, 8, 1, 'NONE'),
+    (900, 900, 0, 5, 'sessionHandling', 0, 0, 8, 1, 'NONE'),
+    (901, 901, 0, 5, 'sessionHandling', 0, 1, 8, 1, 'NONE'),
+    (67, 67, 0, 5, 'quitLink', 0, 4, 8, 1, 'TOP'),
+    (68, 68, 0, 5, 'quitLink', 0, 5, 8, 1, 'NONE'),
+    
+    (69, 69, 0, 5, 'backToStart', 0, 6, 8, 1, 'NONE'),
+    (70, 70, 0, 5, 'backToStart', 0, 8, 8, 2, 'TOP'),
+    (71, 71, 0, 5, 'backToStart', 0, 10, 8, 2, 'TOP'),
+    (72, 72, 0, 5, 'backToStart', 0, 12, 8, 1, 'NONE'),
+
     
     (73, 73, 0, 6, null, 0, 2, 10, 6, 'TOP'),
     (74, 74, 0, 6, null, 1, 1, 1, 1, 'LEFT'), 
@@ -436,7 +441,8 @@ INSERT INTO orientation VALUES
     (301, 301, 0, 9, 'kioskMode', 4, 0, 3, 3, 'NONE'),
     (302, 302, 0, 9, null, 0, 5, 4, 1, 'NONE'),
     (303, 303, 0, 9, null, 0, 6, 4, 1, 'NONE'),
-    (304, 304, 0, 9, null, 4, 5, 3, 1, 'NONE'),
+    (501, 501, 0, 9, null, 4, 5, 3, 1, 'NONE'),
+    (304, 304, 0, 9, null, 4, 6, 3, 1, 'NONE'),
     (305, 305, 0, 9, 'logging', 0, 8, 6, 1, 'NONE'),
     (306, 306, 0, 9, 'logging', 3, 9, 4, 1, 'LEFT_SPAN'),
     (307, 307, 0, 9, 'logging', 3, 10, 4, 1, 'LEFT_SPAN'),
@@ -462,14 +468,13 @@ INSERT INTO orientation VALUES
     (408, 408, 0, 10, 'registry', 0, 9, 4, 1, 'NONE'),
     
     (500, 500, 0, 11, 'specialKeys', 0, 1, 3, 1, 'NONE'),
-    (501, 501, 0, 11, 'specialKeys', 0, 2, 3, 1, 'NONE'),
-    (502, 502, 0, 11, 'specialKeys', 0, 3, 3, 1, 'NONE'),
-    (503, 503, 0, 11, 'specialKeys', 0, 4, 3, 1, 'NONE'),
-    (504, 504, 0, 11, 'specialKeys', 0, 5, 3, 1, 'NONE'),
-    (505, 505, 0, 11, 'specialKeys', 0, 6, 3, 1, 'NONE'),
-    (506, 506, 0, 11, 'specialKeys', 0, 7, 3, 1, 'NONE'),
-    (507, 507, 0, 11, 'specialKeys', 0, 8, 3, 1, 'NONE'),
-    (508, 508, 0, 11, 'specialKeys', 0, 9, 3, 1, 'NONE'),
+    (502, 502, 0, 11, 'specialKeys', 0, 2, 3, 1, 'NONE'),
+    (503, 503, 0, 11, 'specialKeys', 0, 3, 3, 1, 'NONE'),
+    (504, 504, 0, 11, 'specialKeys', 0, 4, 3, 1, 'NONE'),
+    (505, 505, 0, 11, 'specialKeys', 0, 5, 3, 1, 'NONE'),
+    (506, 506, 0, 11, 'specialKeys', 0, 6, 3, 1, 'NONE'),
+    (507, 507, 0, 11, 'specialKeys', 0, 7, 3, 1, 'NONE'),
+    (508, 508, 0, 11, 'specialKeys', 0, 8, 3, 1, 'NONE'),
     
     (509, 509, 0, 11, 'functionKeys', 3, 1, 3, 1, 'NONE'),
     (510, 510, 0, 11, 'functionKeys', 3, 2, 3, 1, 'NONE'),
diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index 51403f2c..f971dec3 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -794,6 +794,8 @@ sebserver.examconfig.props.label.showTaskBar=Show SEB taskbar
 sebserver.examconfig.props.label.showTaskBar.tooltip=The SEB task bar shows and switches between open browser windows,<br/> allowed resources and applications and displays additional controls
 sebserver.examconfig.props.label.taskBarHeight=Taskbar/dock height
 sebserver.examconfig.props.label.taskBarHeight.tooltip=Height of SEB dock/task bar in points/pixels
+sebserver.examconfig.props.label.allowWlan=Show Wi-Fi control (Win)
+sebserver.examconfig.props.label.allowWlan.tooltip=Allows to reconnect to WiFi networks which have previously been connected to
 sebserver.examconfig.props.label.showReloadButton=Show reload button
 sebserver.examconfig.props.label.showReloadButton.tooltip=Reloads current web page. Shows warning if enabled in Browser settings tab
 sebserver.examconfig.props.label.showTime=Show time
@@ -922,6 +924,11 @@ sebserver.examconfig.props.label.allowPDFPlugIn.tooltip=The Adobe Acrobat Reader
 sebserver.examconfig.props.label.downloadAndOpenSebConfig=Download and open SEB Config Files
 sebserver.examconfig.props.label.downloadAndOpenSebConfig.tooltip=Download and open .seb config files regardless if downloading and opening other file types is allowed.
 
+sebserver.examconfig.props.group.sessionHandling=Session Handling
+sebserver.examconfig.props.group.sessionHandling.tooltip=Use the following parameter to control whether a browser session is persistent on disk, e.g. to keep users<br/> logged in after a reconfiguration.
+sebserver.examconfig.props.label.examSessionClearCookiesOnStart=Clear browser session when starting an exam or staring SEB
+sebserver.examconfig.props.label.examSessionClearCookiesOnEnd=Clear browser session when ending an exam or terminating SEB<br/> (prevents deletion of browser cache if deactivated!)
+
 sebserver.examconfig.props.group.quitLink=Link to quit SEB after exam
 sebserver.examconfig.props.label.quitURL=Place this quit link to the 'feedback' page displayed after an exam was successfully finished.<br/> Clicking that link will quit SEB without having to enter the quit password.
 sebserver.examconfig.props.label.quitURLConfirm=Ask user to confirm quitting
@@ -1161,7 +1168,7 @@ sebserver.examconfig.props.label.insideSebEnableNetworkConnectionSelector.toolti
 sebserver.examconfig.props.group.specialKeys=Special Keys
 sebserver.examconfig.props.group.specialKeys.tooltip=Settings to enable or block (hook) keys, key combinations and mouse buttons.
 sebserver.examconfig.props.label.enableEsc=Enable Esc
-sebserver.examconfig.props.label.enablePrintScreen=Enable Print Screen
+sebserver.examconfig.props.label.enablePrintScreen=Allow screen capture
 sebserver.examconfig.props.label.enablePrintScreen.tooltip=Controls Print Screen and OS X screen capture, corresponds with Enable screen capture in Security settings.
 sebserver.examconfig.props.label.enableCtrlEsc=Enable Ctrl-Esc
 sebserver.examconfig.props.label.enableAltEsc=Enable Alt-Esc