diff --git a/swift/common/middleware/tempauth.py b/swift/common/middleware/tempauth.py
index d09410da1a..7f46b425e0 100644
--- a/swift/common/middleware/tempauth.py
+++ b/swift/common/middleware/tempauth.py
@@ -287,10 +287,8 @@ class TempAuth(object):
                 group_list = groups.split(',', 2)
                 if len(group_list) > 1:
                     user = group_list[1]
-                elif groups:
-                    user = group_list[0]
                 else:
-                    user = ''
+                    user = group_list[0]
                 trans_id = env.get('swift.trans_id')
                 self.logger.debug('User: %s uses token %s (trans_id %s)' %
                                   (user, 's3' if s3 else token, trans_id))