diff --git a/bin/module/esme.py b/bin/module/esme.py
index ed15ae7a10dd7b824ca6e1a56490afefe1ad5926..af1ce82c9cacbfaaf9a42cc1509c70912d55e5f8 100755
--- a/bin/module/esme.py
+++ b/bin/module/esme.py
@@ -92,8 +92,8 @@ class FsrLdap:
         """
         logging.info("Fetching Protokollant from LDAP ...")
         try:
-            fil = "(uid="+current_user()+")"
-            if self.conn.search('ou=people,' + self.base, fil,
+            fil = "(objectClass=posixAccount)"
+            if self.conn.search('uid=' + current_user() + ',ou=people,' + self.base, fil,  # noqa: E501
                                 attributes=['displayName']):
                 logging.info("Done")
                 return " ".join(str(self.conn.entries[0]['displayName']).split(", ")[::-1])  # noqa: E501
@@ -157,10 +157,9 @@ class FsrLdap:
             fil = '(cn=intern)'
             fsr = []
             if self.conn.search('ou=group,'+self.base, fil,
-                                attributes=['memberUid']):
-                for i in self.conn.entries[0]['memberUid']:
-                    if self.conn.search('ou=people,' + self.base,
-                                        '(uid='+i+')',
+                                attributes=['member']):
+                for i in self.conn.entries[0]['member']:
+                    if self.conn.search(i, '(objectClass=posixAccount)',
                                         attributes=['displayName']):
                         fsr += [str(self.conn.entries[0]['displayName'])]
                 fsr.sort()
@@ -232,10 +231,9 @@ class FsrLdap:
             fil = '(cn=extern)'
             fsr_extern = []
             if self.conn.search('ou=group,'+self.base, fil,
-                                attributes=['memberUid']):
-                for i in self.conn.entries[0]['memberUid']:
-                    if self.conn.search('ou=people,' + self.base,
-                                        '(uid='+i+')',
+                                attributes=['member']):
+                for i in self.conn.entries[0]['member']:
+                    if self.conn.search(i, '(objectClass=posixAccount)',
                                         attributes=['displayName']):
                         fsr_extern += [str(self.conn.entries[0]['displayName'])]  # noqa: E501
                 fsr_extern.sort()
diff --git a/bin/proto.py b/bin/proto.py
index 26954dd93d608ecf4a757f783447013da927de65..97a48b2c75c7b7f136d024b56d50a126d134e01d 100755
--- a/bin/proto.py
+++ b/bin/proto.py
@@ -240,7 +240,8 @@ if __name__ == "__main__":
 
     if not OPT.Vollversamlung:
         body += gen_attendance_tab(FSR[0], NUM_COLS)
-        body += gen_attendance_tab(FSR[1], NUM_COLS_EXT, ext=True, default = '-')
+        body += gen_attendance_tab(FSR[1], NUM_COLS_EXT,
+                                   ext=True, default='-')
 
     footer = gen_footer(SHARE_DIR, OPT.Vollversamlung, REG,
                         SPRECHER, PROTOKOLLANT, DATE)
diff --git a/share/fsr b/share/fsr
index 47a7d5eeb3ac74bef612e2b044dcdd413153c8ba..546cebed6d20842e226004e3d596a4760473e849 100755
--- a/share/fsr
+++ b/share/fsr
@@ -11,12 +11,10 @@ Katharina Hilgert
 Sarah Kovač
 Rutger Kuwertz
 Felix Lang
-Annika Lesch
 Patrick Mischke
 Jacqueline Momperé
 Kevin Mours
 Tarek Moussa
-Lukas Neusius
 Diana Remmel
 Lorenz Steinert
 Aaron Thielmann
diff --git a/share/fsr_extern b/share/fsr_extern
index 79540b4978e980de45354f0a3338321087d5e630..0af0c58898401bb4af5a35d9700e37c6224311d6 100755
--- a/share/fsr_extern
+++ b/share/fsr_extern
@@ -1,9 +1,13 @@
 Stefano Galimberti
-Tatjana Grün
+Gina Gräßle
+Tamara Hamann
+Sabrina Hammel
 Maximilian Kiefer
 Nikolas Longen
 Christopher Mink
 Linda Müller
 Stephanie Roden
 Matthias Rüb
+Felix Selz
+Sven Stawinski
 Marco Tummeley
diff --git a/share/name.tex b/share/name.tex
index b104a7602829a964f1e5c1923806e1e4993d0b3b..4c089c9035946cb782f66e21253add56ac555d6a 100755
--- a/share/name.tex
+++ b/share/name.tex
@@ -77,7 +77,7 @@
 \\newcommand{\\julian}{Julian Schulz\\xspace}
 \\newcommand{\\juls}{Julian Schulz\\xspace}
 \\newcommand{\\lorenz}{Lorenz Steinert\\xspace}
-\\newcommand{\\marco}{Marco Tummeley\\xspace}
+\\newcommand{\\marco}{Marco Decker\\xspace}
 \\newcommand{\\uei}{Markus Ühlein\\xspace}
 \\newcommand{\\markus}{Markus Ühlein\\xspace}
 \\newcommand{\\sternchen}{Katharina Hilgert\\xspace}
@@ -98,6 +98,8 @@
 \\newcommand{\\jacy}{Jacqueline Momperé\\xspace}
 \\newcommand{\\jaky}{Jacqueline Momperé\\xspace}
 \\newcommand{\\jacky}{Jacqueline Momperé\\xspace}
+\\newcommand{\\sven}{Sven Stawinski\\xspace}
+\\newcommand{\\felixzwei}{Felix Selz\\xspace}