diff --git a/bot.go b/bot.go
index 43bda76..4388f45 100644
--- a/bot.go
+++ b/bot.go
@@ -210,7 +210,7 @@ func botPasswd(m *tb.Message) {
 	err := bot.bot.Delete(m)
 	logErrorDebug(err, "botPasswd : Delete")
 
-	srv.SetPasswd(co.CompanyID, cc.Passwd)
+	srv.SetPasswd(co.CompanyExtlID, cc.Passwd)
 
 	bot.SendUser(int64(m.Sender.ID), fmt.Sprintf("Passwd set to \"%s\"", cc.Passwd))
 
diff --git a/ttd.go b/ttd.go
index 9823f30..a3522ef 100644
--- a/ttd.go
+++ b/ttd.go
@@ -447,7 +447,7 @@ func (s *ServerTTD) Poll(stop chan struct{}) {
 				Packet: p,
 			}
 			sp.Read(buffer[:p.PLength])
-			r := regexp.MustCompile("#:(?P<CompanyID>[0-9]+)\\(.*\\) Company Name: '(?P<CompanyName>.+)'.*Value: (?P<CompanyValue>[0-9]+)( )+.*")
+			r := regexp.MustCompile("#:(?P<CompanyID>[0-9]+)\\(.*\\) Company Name: '(?P<CompanyName>.+)'.*Value: (?P<CompanyValue>[0-9]+)( )+.*$")
 			if r.MatchString(sp.Output) {
 				for _, co := range srv.Status.Companies {
 					if co.Name == r.ReplaceAllString(sp.Output, "${CompanyName}") {
@@ -457,6 +457,15 @@ func (s *ServerTTD) Poll(stop chan struct{}) {
 					}
 				}
 			}
+			r = regexp.MustCompile("Client #(?P<ClientID>[0-9]+).*name: '(?P<ClientName>.+)'.*company: (?P<CompanyID>[0-9]+)( )+IP: .*$")
+			if r.MatchString(sp.Output) {
+				for _, c := range srv.Status.Clients {
+					if c.Name == r.ReplaceAllString(sp.Output, "${ClientName}") {
+						c.ClientExtlID, _ = strconv.ParseInt(r.ReplaceAllString(sp.Output, "${ClientID}"), 10, 64)
+						break
+					}
+				}
+			}
 			logInfoDebug("Server.Poll() : AdminPacketServerRCon :\n-  ColorID: %d\n-  Output: %s", sp.ColorID, sp.Output)
 
 		case AdminPacketServerRConEnd:
@@ -778,7 +787,7 @@ func (s *ServerTTD) Initialize() {
 	s.UpdateClients()
 }
 
-func (s *ServerTTD) SetPasswd(id uint8, passwd string) {
+func (s *ServerTTD) SetPasswd(id int64, passwd string) {
 	px := PacketAdminRCon{
 		Packet:  Packet{PType: AdminPacketAdminRCon},
 		Command: fmt.Sprintf("company_pw %d %s", id, passwd),
diff --git a/version.go b/version.go
index da5283f..eb3663a 100644
--- a/version.go
+++ b/version.go
@@ -1,6 +1,6 @@
 // Code generated by version.sh (@generated) DO NOT EDIT.
 package main
-var githash = "6e092ea"
-var buildstamp = "2021-11-10_06:35:44"
-var commits = "183"
-var version = "6e092ea-b183 - 2021-11-10_06:35:44"
+var githash = "bcc20d3"
+var buildstamp = "2021-11-10_06:41:59"
+var commits = "184"
+var version = "bcc20d3-b184 - 2021-11-10_06:41:59"