diff --git a/oml/server.py b/oml/server.py
index 21ed1b6..01d1d22 100644
--- a/oml/server.py
+++ b/oml/server.py
@@ -33,7 +33,8 @@ def run():
     static_path = os.path.join(root_dir, 'static')
 
     options = {
-        'debug': not PID 
+        'debug': not PID,
+        'gzip': True
     }
 
     handlers = [
diff --git a/oml/user/models.py b/oml/user/models.py
index 0586135..68cc576 100644
--- a/oml/user/models.py
+++ b/oml/user/models.py
@@ -80,8 +80,11 @@ class User(db.Model):
             self.pending = ''
             if username:
                 self.info['username'] = username
-
-            self.set_nickname(self.info.get('username', 'anonymous'))
+            else:
+                username = self.info.get('username')
+            if not username:
+                username = 'anonymous'
+            self.set_nickname(username)
             # FIXME: need to set peered to False to not trigger changelog event
             # before other side receives acceptPeering request
             self.peered = False