diff --git a/assets/css/opencast.scss b/assets/css/opencast.scss
index b433b250d..8f2b9703e 100644
--- a/assets/css/opencast.scss
+++ b/assets/css/opencast.scss
@@ -717,6 +717,11 @@ h2.oc--loadingbar, .oc--loadingbar-title {
             text-align: right;
             margin-right: 10px;
         }
+
+        .oc--admin--server-icons {
+            float: left;
+            margin-top: 8px;
+        }
     }
 
     .oc--admin--server-data {
diff --git a/lib/Models/Config.php b/lib/Models/Config.php
index 2426442fe..10c7fefca 100644
--- a/lib/Models/Config.php
+++ b/lib/Models/Config.php
@@ -189,13 +189,24 @@ public function updateEndpoints($container)
                     $comp = $services_client->getRESTComponents();
                 }
                 catch(\Exception $e) {
-                    return [
-                        'type' => 'error',
-                        'text' => sprintf(
-                            _('%s'),
-                            $e->getMessage()
-                        )
-                    ];
+                    if (str_starts_with($e->getMessage(), 'cURL error 6')) {
+                        return [
+                            'type' => 'error',
+                            'text' => sprintf(
+                                _('Die angegebene URL %s konnte nicht gefunden werden. Überprüfen Sie bitte ihre Eingabe und versuchen Sie es erneut.'),
+                                $service_host
+                            )
+                        ];
+                    }
+                    else {
+                        return [
+                            'type' => 'error',
+                            'text' => sprintf(
+                                _('%s'),
+                                $e->getMessage()
+                            )
+                        ];
+                    }
                 }
             } catch (AccessDeniedException $e) {
                 Endpoints::removeEndpoint($this->id, 'services');
@@ -203,7 +214,7 @@ public function updateEndpoints($container)
                 $message = [
                     'type' => 'error',
                     'text' => sprintf(
-                        _('Fehlerhafte Zugangsdaten für die Opencast Installation mit der URL "%s". Überprüfen Sie bitte die eingebenen Daten.'),
+                        _('Fehlerhafte Zugangsdaten für die Opencast Installation mit der URL "%s". Überprüfen Sie bitte die eingegebenen Daten.'),
                         $service_host
                     )
                 ];
@@ -252,8 +263,6 @@ public function updateEndpoints($container)
                         'type' => 'success',
                         'text' => implode('<br>', $success_message)
                     ];
-
-                    $config_checked = true;
                 }
             } else {
                 $message = [
diff --git a/lib/Routes/Config/ConfigAdd.php b/lib/Routes/Config/ConfigAdd.php
index dfcf39f26..51a52450d 100644
--- a/lib/Routes/Config/ConfigAdd.php
+++ b/lib/Routes/Config/ConfigAdd.php
@@ -25,7 +25,6 @@ public function __invoke(Request $request, Response $response, $args)
 
         $json = $this->getRequestData($request);
 
-        $config_checked = false;
         $duplicate_url = false;
 
         // check, if a config with the same data already exists:
@@ -68,7 +67,7 @@ public function __invoke(Request $request, Response $response, $args)
         $ret_config = array_merge($ret_config, $ret_config['settings']);
         unset($ret_config['settings']);
 
-        if ($config_checked) {
+        if ($message['type'] == 'success') {
             $lti = LtiHelper::getLaunchData($config->id);
 
             return $this->createResponse([
diff --git a/lib/Routes/Config/ConfigEdit.php b/lib/Routes/Config/ConfigEdit.php
index b994a1ae9..705b1c545 100644
--- a/lib/Routes/Config/ConfigEdit.php
+++ b/lib/Routes/Config/ConfigEdit.php
@@ -24,7 +24,6 @@ public function __invoke(Request $request, Response $response, $args)
 
         $json = $this->getRequestData($request);
 
-        $config_checked = false;
         $duplicate_url = false;
 
         $config = Config::find($args['id']);
@@ -49,7 +48,7 @@ public function __invoke(Request $request, Response $response, $args)
         $ret_config = array_merge($ret_config, $ret_config['settings']);
         unset($ret_config['settings']);
 
-        if ($config_checked) {
+        if ($message['type'] == 'success') {
             $lti = LtiHelper::getLaunchData($config->id);
 
             return $this->createResponse([
diff --git a/vueapp/components/Config/EditServer.vue b/vueapp/components/Config/EditServer.vue
index 778ff99f0..a0554cc4b 100644
--- a/vueapp/components/Config/EditServer.vue
+++ b/vueapp/components/Config/EditServer.vue
@@ -26,7 +26,7 @@
                             @updateValue="updateValue" />
                     </fieldset>
 
-                    <WorkflowOptions v-if="id != 'new'"/>
+                    <WorkflowOptions :disabled="currentId === 'new'" ref="workflow-form"/>
                 </form>
 
                 <MessageList :float="true"/>
@@ -34,7 +34,7 @@
             </template>
 
             <template v-slot:dialogButtons>
-                <button v-if="config !== null"
+                <button v-if="currentId !== 'new'"
                     class="button trash"
                     type="button"
                     @click="deleteConfig"
@@ -86,7 +86,8 @@ export default {
     data() {
         return {
             currentConfig: {},
-            disabled: false
+            disabled: false,
+            newId: null
         }
     },
 
@@ -96,6 +97,10 @@ export default {
             simple_config_list: 'simple_config_list'
         }),
 
+        currentId() {
+            return this.newId ? this.newId : this.id;
+        },
+
         settings() {
             return [
                 {
@@ -171,7 +176,7 @@ export default {
 
             this.currentConfig.checked = false;
 
-            if (this.id == 'new') {
+            if (this.currentId == 'new') {
                 this.$store.dispatch('configCreate', this.currentConfig)
                 .then(({ data }) => {
                     this.disabled = false;
@@ -193,10 +198,10 @@ export default {
 
         deleteConfig() {
             if (confirm(this.$gettext('Sind Sie sicher, dass Sie die Serverkonfiguration löschen möchten? Die damit verbundenen Videos werden danach nicht mehr in Stud.IP zur Verfügung stehen!'))) {
-                if (this.id == 'new') {
+                if (this.currentId == 'new') {
                     this.currentConfig = {}
                 } else {
-                    this.$store.dispatch('configDelete', this.id)
+                    this.$store.dispatch('configDelete', this.currentId)
                         .then(() => {
                             this.$store.dispatch('configListRead');
                             this.$store.dispatch('addMessage', {
@@ -212,43 +217,88 @@ export default {
         },
 
         checkConfigResponse(data) {
-            if (data.lti !== undefined) {
-                this.checkLti(data.lti);
-            }
             if (data.message !== undefined) {
-                this.$store.dispatch('addMessage', {
-                     type: data.message.type,
-                     text: data.message.text
-                });
+                if (data.message.type === 'error') {
+                    this.$store.dispatch('addMessage', {
+                        type: data.message.type,
+                        text: data.message.text
+                    });
+                    return;
+                }
+                else if (data.message.type === 'success') {
+                    // Check if LTI connection is available
+                    let lti_checked = false;
+                    this.checkLti(data.lti).then((result) => {
+                        lti_checked = result;
+                    });
+
+                    if (this.currentId !== 'new') {
+                        // Just show success message if server was edited
+                        this.$store.dispatch('addMessage', {
+                            type: data.message.type,
+                            text: data.message.text
+                        });
+                    }
+                    else {
+                        // On create, scroll to the default workflow configuration
+                        this.$store.dispatch('addMessage', {
+                            type: data.message.type,
+                            text: data.message.text + ' Sie können nun die Standardworkflows einstellen oder die Konfiguration abschließen.'
+                        });
+
+                        this.newId = data.config.id;
+                        this.$store.dispatch('simpleConfigListRead');
 
-                if(data.message.type == 'success'){
-                    this.$emit('close');
+                        let view = this;
+                        // We need to wait for a short time so the component is actually visible
+                        setTimeout(() => {  
+                            view.$refs['workflow-form'].$el.scrollIntoView({
+                                behavior: 'smooth'
+                            });
+                        }, 10);
+                    }
+                    
+                    if (!lti_checked) {
+                        // Show LTI error
+                        this.postLtiCheckFailedMessage();
+                    }
+                    else if (this.currentId !== 'new') {
+                        // Only close dialog, if lti successfull and no new server was created
+                        this.$emit('close');
+                    }
+
+                    return;
                 }
             }
+
+            this.$store.dispatch('addMessage', {
+                    type: 'error',
+                    text: this.$gettext('Bei der Konfiguration ist ein Fehler aufgetreten. Versuchen Sie es bitte erneut.')
+            });
         },
 
         async checkLti(data)
         {
-            let view = this;
-
             await this.$store.dispatch('authenticateLti');
 
             // make an lti call to make sure it worked, there are some caveats though...
             // - already succesful calls will not be revoked
             // - unsuccesful calls will persist even if it worked now
-            axios({
-                url: data[0].launch_url,
-                method: "GET",
-                withCredentials: true,
-            }).then(({ data }) => {
-                if (data.user_id == undefined) {
-                    view.postLtiCheckFailedMessage();
+            try {
+                const response = await axios({
+                    url: data[0].launch_url,
+                    method: "GET",
+                    withCredentials: true,
+                });
+
+                if (response.user_id == undefined) {
+                    return false;
                 } else {
-                    view.postLtiCheckSucceededMessage();
+                    return true;
                 }
-            }).catch(function (error) {
-                view.postLtiCheckFailedMessage();
-            });
+            } catch (error) {
+                return false;
+            }
         },
 
         postLtiCheckFailedMessage()
@@ -264,14 +314,6 @@ export default {
             });
         },
 
-        postLtiCheckSucceededMessage()
-        {
-            this.$store.dispatch('addMessage', {
-                type: 'success',
-                text: this.$gettext('Die LTI-Konfiguration wurde erfolgreich überprüft!')
-            });
-        },
-
         updateValue(setting, newValue) {
             this.currentConfig[setting.name] = newValue;
         },
@@ -280,9 +322,9 @@ export default {
     mounted() {
         this.$store.dispatch('clearMessages');
 
-        if (this.id !== 'new') {
+        if (this.currentId !== 'new') {
             if (!this.config) {
-                this.$store.dispatch('configRead', this.id)
+                this.$store.dispatch('configRead', this.currentId)
                 .then(() => {
                     this.currentConfig = this.configStore;
                 });
diff --git a/vueapp/components/Config/ServerCard.vue b/vueapp/components/Config/ServerCard.vue
index 5cf15dd3e..b54e4e36e 100644
--- a/vueapp/components/Config/ServerCard.vue
+++ b/vueapp/components/Config/ServerCard.vue
@@ -2,10 +2,13 @@
     <div class="oc--admin--server-card">
         <div class="oc--admin--server-image">
             <OpencastIcon />
-            <span v-if="config" class="oc--admin--server-id">
+            <span v-if="!isAddCard" class="oc--admin--server-id">
                 #{{ config.id }}
             </span>
-            <span v-else class="oc--admin--server-id">
+            <span v-if="!isAddCard && checkFailed" class="oc--admin--server-icons">
+                <studip-icon shape="exclaim-circle" role="status-red" :size="32"/>
+            </span>
+            <span v-if="isAddCard" class="oc--admin--server-id">
                 +
             </span>
         </div>
@@ -27,13 +30,16 @@
         <EditServer v-if="isShow"
             :id="config ? config.id : 'new'"
             :config="config"
-            @close="isShow = false"
+            @close="closeEditServer"
         />
     </div>
 </template>
 
 <script>
+import { mapGetters } from "vuex";
+
 import OpencastIcon from "@/components/OpencastIcon";
+import StudipIcon from '@studip/StudipIcon.vue';
 import EditServer from "@/components/Config/EditServer";
 
 export default {
@@ -52,18 +58,74 @@ export default {
 
     data() {
         return {
-            isShow: false
+            isShow: false,
+            checkFailed: false,
+            interval: null,
+            interval_counter: 0,
+            error_msg: this.$gettext('Überprüfung der LTI Verbindung fehlgeschlagen! '
+                + 'Kontrollieren Sie die eingetragenen Daten und stellen Sie sicher, '
+                + 'dass Cross-Origin Aufrufe von dieser Domain aus möglich sind! '
+                + 'Denken sie auch daran, in Opencast die korrekten access-control-allow-* '
+                + 'Header zu setzen.'
+            )
         }
     },
 
     components: {
         OpencastIcon,
         EditServer,
+        StudipIcon
+    },
+
+    computed: {
+        ...mapGetters([
+            'isLTIAuthenticated',
+            'errors'
+        ])
     },
 
     methods: {
         showEditServer() {
-            this.isShow = true
+            this.isShow = true;
+
+            if (this.checkFailed && !this.errors.find((e) => e === this.error_msg)) {
+                this.$store.dispatch('errorCommit', this.error_msg);
+            }
+        },
+
+        closeEditServer() {
+            this.$store.dispatch('errorRemove', this.error_msg);
+            this.isShow = false;
+        },
+
+        checkLTIPeriodically() {
+            let view = this;
+
+            // periodically check, if lti is authenticated
+            view.interval = setInterval(() => {
+                view.$store.dispatch('checkLTIAuthentication', {id: view.config.id, name: view.config.service_url})
+                .then(() => {
+                    // Make sure error is removed when authenticated
+                    if (view.isLTIAuthenticated[view.config.id]) {
+                        view.$store.dispatch('errorRemove', this.error_msg);
+                        view.checkFailed = false;
+                        clearInterval(view.interval);
+                    } else {
+                        view.checkFailed = true;
+                    }
+
+                    view.interval_counter++;
+                    if (view.interval_counter > 10) {
+                        clearInterval(view.interval);
+                    }
+                });
+            }, 2000);
+        }
+    },
+
+    mounted() {
+        if (!this.isAddCard) {
+            this.checkLTIPeriodically();
         }
     }
 }
diff --git a/vueapp/components/Config/WorkflowOptions.vue b/vueapp/components/Config/WorkflowOptions.vue
index bf9774667..e80927bf3 100644
--- a/vueapp/components/Config/WorkflowOptions.vue
+++ b/vueapp/components/Config/WorkflowOptions.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="oc--admin--section">
-        <fieldset class="collapsable">
+        <fieldset class="collapsable" v-if="!disabled">
             <legend>
                 {{ $gettext('Standardworkflows') }}
             </legend>
@@ -34,8 +34,12 @@ export default {
         I18NText
     },
 
+    props: {
+        disabled: true
+    },
+
     computed: {
-        ...mapGetters(['config', 'simple_config_list']),
+        ...mapGetters(['simple_config_list']),
 
         workflow_definitions() {
             let wf_defs = [];