diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
index 4ccd5c509..3512898e7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs	
@@ -687,38 +687,74 @@ namespace Learun.Application.Web.Controllers
                                 var Returnurl = "http://" + Request.Url.Host + ":" + Request.Url.Port;
                                 if (!string.IsNullOrEmpty(n))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index?autoopen=6252983c-52f5-402c-991b-ad19a9cb1f94&keyValue=" + n);
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index?autoopen=6252983c-52f5-402c-991b-ad19a9cb1f94&keyValue=" + n));
                                 }
                                 else if (!string.IsNullOrEmpty(mail))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index?autoopen=252878d7-d807-497f-b01e-839bb1b869c6");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index?autoopen=252878d7-d807-497f-b01e-839bb1b869c6"));
                                 }
                                 else if (!string.IsNullOrEmpty(sendfile))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index?autoopen=19637c39-624d-4be6-b680-04250f8df71f");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index?autoopen=19637c39-624d-4be6-b680-04250f8df71f"));
                                 }
                                 else if (!string.IsNullOrEmpty(task))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index?autoopen=56ce34c2-882e-47d1-b12d-5036e3b79fcf"));
                                 }
                                 else if (!string.IsNullOrEmpty(gotomain))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index"));
                                 }
                                 else if (!string.IsNullOrEmpty(nk))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index?autoopen=07ceccd0-cf74-42ec-9b7d-3b36af0be451");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index?autoopen=07ceccd0-cf74-42ec-9b7d-3b36af0be451"));
                                 }
                                 else if (!string.IsNullOrEmpty(jx))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index?autoopen=5f2e3e9b-b0da-421a-b370-671dcae4fc17");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index?autoopen=5f2e3e9b-b0da-421a-b370-671dcae4fc17"));
                                 }
                                 else if (!string.IsNullOrEmpty(zl))
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/Home/Index?autoopen=8dfd9f38-8cab-49ff-b4d1-8b899b1ecbca");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + HttpUtility.UrlEncode(Returnurl + "/Home/Index?autoopen=8dfd9f38-8cab-49ff-b4d1-8b899b1ecbca"));
                                 }
                                 else
                                 {
+                                    if (string.IsNullOrEmpty(DigitalschoolMisLoginurl))
+                                    {
+                                        return Redirect("/SSOSystem/Index");
+                                    }
                                     return Redirect(DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index");
                                 }
                             }