diff --git a/ttd.go b/ttd.go
index 0390fa9..7e0c995 100644
--- a/ttd.go
+++ b/ttd.go
@@ -558,7 +558,17 @@ func (s *ServerTTD) UpdateCompanies() {
 			logErrorDebug(err, "Server.UpdateClients() : Send(PacketAdminPoll) : AdminPacketAdminRCon")
 			break
 		} else if !co.Protected {
-			s.SetPasswd(co.CompanyExtlID, "blabla")
+			for _, cc := range cfg.Clients {
+				if cc.CompanyID == co.CompanyID {
+					s.SetPasswd(co.CompanyExtlID, cc.Passwd)
+					co.Protected = true
+					break
+				}
+			}
+			if !co.Protected {
+				s.SetPasswd(co.CompanyExtlID, "blabla")
+			}
+
 		}
 	}
 	s.Status.UpdateCompanies = time.Now()
diff --git a/version.go b/version.go
index 95e7419..ceb9c08 100644
--- a/version.go
+++ b/version.go
@@ -1,6 +1,6 @@
 // Code generated by version.sh (@generated) DO NOT EDIT.
 package main
-var githash = "f84f361"
-var buildstamp = "2021-11-10_06:55:15"
-var commits = "186"
-var version = "f84f361-b186 - 2021-11-10_06:55:15"
+var githash = "0d5c94e"
+var buildstamp = "2021-11-10_07:04:16"
+var commits = "187"
+var version = "0d5c94e-b187 - 2021-11-10_07:04:16"