@@ -168,7 +168,8 @@ export type TeacherData = {
 export type LoginRequest = {
     username: string,
     password: string,
-    language: number
+    language: number,
+    singleUseToken: string | null
 }
 
 export type TicketLoginRequest = {
@@ -182,7 +183,8 @@ export type LoginResponse = {
     classdata: ClassData[], // null if !is_teacher
     workspaces: Workspaces,
     csrfToken: string,
-    isTestuser: boolean
+    isTestuser: boolean,
+    vidis_id_token?: string
 }
 
 export type LogoutRequest = {
 
@@ -10,6 +10,7 @@ import jQuery from "jquery";
 export class Login {
 
     loggedInWithVidis: boolean = false;
+    vidis_id_token: string = "";
 
     constructor(private main: Main) {
         new AutoLogout(this);
@@ -120,8 +121,8 @@ export class Login {
                     // window.location.href = 'index.html';
 
                     if (this.loggedInWithVidis) {
-                        window.location.assign("https://aai-test.vidis.schule/auth/realms/vidis/protocol/openid-connect/logout?ID_TOKEN_HINT=" + this.main.user.vidis_sub + "&post_logout_redirect_uri=https%3A%2F%2Fwww.sql-ide.de");
-                        // window.location.assign("https://aai.vidis.schule/auth/realms/vidis/protocol/openid-connect/logout?ID_TOKEN_HINT=" + this.main.user.vidis_sub + "&post_logout_redirect_uri=https%3A%2F%2Fwww.sql-ide.de");
+                        window.location.assign("https://aai-test.vidis.schule/auth/realms/vidis/protocol/openid-connect/logout?ID_TOKEN_HINT=" + this.vidis_id_token + "&post_logout_redirect_uri=https%3A%2F%2Fonline-ide.de/vidisLogout");
+                        // window.location.assign("https://aai.vidis.schule/auth/realms/vidis/protocol/openid-connect/logout?ID_TOKEN_HINT=" + this.vidis_id_token + "&post_logout_redirect_uri=https%3A%2F%2Fonline-ide.de/vidisLogout");
                     } else {
                         window.location.assign("/" + (isSilent ? "?silent=true" : ""));
 
@@ -164,17 +165,21 @@ export class Login {
         $loginSpinner.show();
 
         let loginRequest: LoginRequest = {
-            username: <string>jQuery('#login-username').val(),
-            password: <string>jQuery('#login-password').val(),
-            language: 1
+            username: singleUseToken ? "" : <string>jQuery('#login-username').val(),
+            password: singleUseToken ? "" : <string>jQuery('#login-password').val(),
+            language: 1, 
+            singleUseToken: singleUseToken || null
         }
 
-        ajax('login' + (singleUseToken ? ('?singleUseToken=' + singleUseToken) : ''), loginRequest, (response: LoginResponse) => {
+        ajax('login', loginRequest, (response: LoginResponse) => {
 
             if (!response.success) {
                 jQuery('#login-message').html('Fehler: Benutzername und/oder Passwort ist falsch.');
             } else {
 
+                this.loggedInWithVidis = response.vidis_id_token != null;
+                this.vidis_id_token = response.vidis_id_token;
+
                 PushClientManager.getInstance().open();
 
                 // We don't do this anymore for security reasons - see AjaxHelper.ts
 
@@ -4,7 +4,7 @@ import { Compiler, CompilerStatus } from "../compiler/Compiler.js";
 import { Module } from "../compiler/parser/Module.js";
 import { SemicolonAngel } from "../compiler/parser/SemicolonAngel.js";
 import { DatabaseTool } from "../sqljs-worker/DatabaseTools.js";
-import { checkIfMousePresent, getCookieValue } from "../tools/HtmlTools.js";
+import { checkIfMousePresent, findGetParameter, getCookieValue } from "../tools/HtmlTools.js";
 import { Workspace } from "../workspace/Workspace.js";
 import { ActionManager } from "./gui/ActionManager.js";
 import { BottomDiv } from "./gui/BottomDiv.js";
@@ -145,15 +145,10 @@ export class Main implements MainBase {
 
         this.login = new Login(this);
 
-        let singleUseToken1 = location.search.split('singleUseToken=')[1];
-        if(singleUseToken1){
-            setCookie("singleUseToken", singleUseToken1, 3);
-        }
+        let singleUseToken = findGetParameter("singleUseToken");
 
-        let singleUseToken: string | undefined = getCookieValue("singleUseToken");
 
         if(singleUseToken){
-            setCookie("singleUseToken", "", 0);
             this.login.initGUI();
             this.login.loginWithVidis(singleUseToken);    
         } else {
 
@@ -100,11 +100,21 @@ export class ResultsetPresenter {
     }
 
     exportCSV(){
+        let quotationMark = '"';
+        let separator = ",";
+        if(!this.main.isEmbedded()){
+            if((<Main>this.main).user.schule_id == 243){
+                console.log("Using semicolon as separator and no quotation marks for CSV export, because school has id 243.");
+                quotationMark = "";
+                separator = ";";
+            }
+        }
+
         let file: string = "";
         // file += table.columns.map(c => c.identifier).join("; ") + "\n";
         if(this.result){
-            file += this.result.columns.map(c => `"${c}"`).join(",") + "\n";
-            file += this.result.values.map(line => line.map(c => `"${c}"`).join(",")).join("\n");
+            file += this.result.columns.map(c => `${quotationMark}${c}${quotationMark}`).join(separator) + "\n";
+            file += this.result.values.map(line => line.map(c => `${quotationMark}${c}${quotationMark}`).join(separator)).join("\n");
         }
         downloadFile("\ufeff" + file, "results.csv", false);
 
 
@@ -318,4 +318,17 @@ export function getCookieValue(name: string): string | undefined
   if (match) {
     return match[2]
   }
-}
+}
+
+export function findGetParameter(parameterName: string): string | null {
+    var result: string | null = null,
+        tmp: string[] = [];
+    location.search
+        .substring(1)
+        .split("&")
+        .forEach(function (item) {
+            tmp = item.split("=");
+            if (tmp[0] === parameterName) result = decodeURIComponent(tmp[1]);
+        });
+    return result;
+}