diff --git a/fstack/lib/ldap.sh b/fstack/lib/ldap.sh
index 3a1c9fb..cbaa6c6 100644
--- a/fstack/lib/ldap.sh
+++ b/fstack/lib/ldap.sh
@@ -90,7 +90,7 @@ objectClass: top
 objectClass: posixGroup
 objectClass: groupOfUniqueNames
 cn: everybody
-uniqueMember: uid=admin-federated,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
+uniqueMember: uid=admin,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
 gidNumber: 2001
 structuralObjectClass: groupOfUniqueNames
 
@@ -99,11 +99,12 @@ objectClass: top
 objectClass: posixGroup
 objectClass: groupOfUniqueNames
 cn: admins
-uniqueMember: uid=admin-$DOMAIN_FIRST,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
+uniqueMember: uid=admin,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
 gidNumber: 2002
 structuralObjectClass: groupOfUniqueNames
 
 dn: uid=admin,ou=people,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
+givenName: admin
 sn: admin
 uid: admin
 mail: admin@$DOMAIN
@@ -120,8 +121,8 @@ gidNumber: 2001
 loginShell: /bin/bash
 homeDirectory: /home/admin
 structuralObjectClass: inetOrgPerson
-memberOf: cn=everybody,ou=groups,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
 memberOf: cn=admins,ou=groups,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
+memberOf: cn=everybody,ou=groups,dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST
 EOF
 
 cat > fstack/ldap/data/root/ldap.sh <<'EOF'
@@ -160,7 +161,7 @@ start_ldap() {
 
     # Keep trying ldap port to make sure it's up
     # before we proceed
-    RETRY="23"
+    RETRY="25"
     while [ $RETRY -gt 0 ]; do
       nc -z 172.99.0.11 636 &> /dev/null
       if [ $? -eq 0 ]; then
diff --git a/fstack/lib/mail.sh b/fstack/lib/mail.sh
index 9914ce0..f3837ce 100644
--- a/fstack/lib/mail.sh
+++ b/fstack/lib/mail.sh
@@ -194,6 +194,12 @@ start_mail() {
 
   docker exec -it dns rndc reload &> /dev/null
   [ $? -ne 0 ] && fail "Couldn't run rndc reload on fstack/dns container"
+
+  # Enable SSL module in fstack/webmail
+  docker exec -it webmail a2enmod ssl &> /dev/null
+  [ $? -ne 0 ] && fail "Couldn't run a2enmod ssl in fstack/webmail container"
+
+  docker exec -it webmail service apache2 restart
   
   kill -9 $SPINPID &> /dev/null
   echo -ne "done."
diff --git a/fstack/lib/nextcloud.sh b/fstack/lib/nextcloud.sh
index c8e4a31..6023cdf 100644
--- a/fstack/lib/nextcloud.sh
+++ b/fstack/lib/nextcloud.sh
@@ -171,6 +171,12 @@ start_nextcloud() {
   # Run nextcloud.sh - Setup LDAP, configuration for nextcloud
   docker exec -it -u 33 nextcloud /var/www/html/nextcloud.sh &> /dev/null
   [ $? -ne 0 ] && fail "Couldn't run nextcloud.sh inside fstack/nextcloud container"
+
+  # Enable SSL module in fstack/nextcloud
+  docker exec -it nextcloud a2enmod ssl
+  [ $? -ne 0 ] && fail "Couldn't run a2enmod ssl in fstack/nextcloud container"
+
+  docker exec -it nextcloud service apache2 restart
   
   kill -9 $SPINPID &> /dev/null
   echo -ne "done."
diff --git a/install-federated.sh b/install-federated.sh
index 1030053..a4531a1 100755
--- a/install-federated.sh
+++ b/install-federated.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Federated Stack installation script