diff U5 orig/opsi-client-agent/files/opsi/setup412.opsiscript mod/opsi-client-agent/files/opsi/setup412.opsiscript
--- orig/opsi-client-agent/files/opsi/setup412.opsiscript   Thu Oct 18 17:19:13 2018
+++ mod/opsi-client-agent/files/opsi/setup412.opsiscript    Mon Feb  4 11:45:54 2019
@@ -729,29 +729,35 @@
        comment "Try to open new network connection"
        set $INST_Authenticated$ = opsiservice_authenticated($INST_Service_User$,$Inst_Service_Password$,$OCD_config_service.url$,"false")
        set $INST_userIsAdmin$ = opsiservice_UserIsAdmin()
    endif
    if ($INST_Authenticated$ = "false") or ($INST_userIsAdmin$ = "false")
-       comment "was not authenticated as admin-> retry interactive"
-       set $INST_Authenticated$ = opsiservice_authenticated("","",$OCD_config_service.url$,"true")
-       set $INST_userIsAdmin$ = opsiservice_UserIsAdmin()
-   endif
-   if ($INST_Authenticated$ = "false") or ($INST_userIsAdmin$ = "false")
-       comment "was not authenticated as admin-> giving up"
        if $INST_Authenticated$ = "true"
            LogWarning "We are authenticated but no admin login"
            LogWarning "Authenitcated user: " + $INST_Service_User$ + " is not a opsiadmin"
            comment "We go on and will see if this user has the credentials to create a client"
-       else
-           logerror "We are not authenticated"
-           logerror "No admin login"
-           pause "Error: No admin login - exiting"
-           isFatalError
+       else
+           comment "was not authenticated-> retry interactive"
+           set $INST_Authenticated$ = opsiservice_authenticated("","",$OCD_config_service.url$,"true")
+           set $INST_userIsAdmin$ = opsiservice_UserIsAdmin()
+           if ($INST_Authenticated$ = "false") or ($INST_userIsAdmin$ = "false")
+               comment "was not authenticated as admin-> giving up"
+               if $INST_Authenticated$ = "true"
+                   LogWarning "We are authenticated but no admin login"
+                   LogWarning "Authenitcated user: " + $INST_Service_User$ + " is not a opsiadmin"
+                   comment "We go on and will see if this user has the credentials to create a client"
+               else
+                   logerror "We are not authenticated"
+                   logerror "No admin login"
+                   pause "Error: No admin login - exiting"
+                   isFatalError
+               endif
+           endif
        endif
    endif
    LoadProductProperties $INST_ClientId$ "opsi-client-agent"

    comment "get MAC and IP for Service connection"