diff --git a/passbook/lib/default.yml b/passbook/lib/default.yml
index 8c2bedaf6..8c0119294 100644
--- a/passbook/lib/default.yml
+++ b/passbook/lib/default.yml
@@ -16,9 +16,7 @@ debug: false
 # Error reporting, sends stacktrace to sentry.services.beryju.org
 error_report_enabled: true
 
-domains:
-  - passbook.local
-primary_domain: 'localhost'
+domain: passbook.local
 
 passbook:
   sign_up:
@@ -48,8 +46,6 @@ passbook:
   uid_fields:
     - username
     - email
-  session:
-    remember_age: 2592000 # 60 * 60 * 24 * 30, one month
 # Provider-specific settings
 ldap:
   # Which field from `uid_fields` maps to which LDAP Attribute
@@ -61,6 +57,3 @@ ldap:
       username: "%(sAMAccountName)s"
       email: "%(mail)s"
       name: "%(displayName)"
-app_gw:
-  listen: 0.0.0.0
-  port: 8000
diff --git a/passbook/root/settings.py b/passbook/root/settings.py
index 272defc27..51a815bcb 100644
--- a/passbook/root/settings.py
+++ b/passbook/root/settings.py
@@ -47,6 +47,7 @@ AUTH_USER_MODEL = 'passbook_core.User'
 
 CSRF_COOKIE_NAME = 'passbook_csrf'
 SESSION_COOKIE_NAME = 'passbook_session'
+SESSION_COOKIE_DOMAIN = CONFIG.y('domain', None)
 LANGUAGE_COOKIE_NAME = 'passbook_language'
 
 AUTHENTICATION_BACKENDS = [