diff --git a/bin/convertdomain b/bin/convertdomain
index fc0e313..2751bc1 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -373,10 +373,6 @@ PATH=/var/www/html:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/sbin:/bin
 /var/www/html/occ config:import configs.json
 EOF
 
-#  sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/nextcloud/data/var/www/html/config.sh
-#  sed -i "s#$DOMAIN#$DOMAIN_NEW#g" /federated/apps/nextcloud/data/var/www/html/configs.json
-#  sed -i "s#dc=federatedcomputer,dc=cloud#dc=$DOMAIN_FIRST,dc=$DOMAIN_LAST#g" /federated/apps/nextcloud/data/var/www/html/config.sh
-
   # Grab the container IP from docker-compose
   SERVICE_IP=`grep ipv4_address /federated/apps/nextcloud/docker-compose.yml | awk '{ print $2 }'`
 
@@ -389,8 +385,19 @@ EOF
   docker exec nextcloud chmod 755 /var/www/html/config.sh
   [ $? -ne 0 ] && fail "Couldn't chown config.sh in /federated/apps/nextcloud container"
 
-  docker exec -it -u 33 nextcloud /var/www/html/config.sh
-  docker exec -it -u 33 nextcloud bash -c "/var/www/html/occ mail:account:create admin admin admin@$DOMAIN_NEW mail.$DOMAIN_NEW 993 ssl admin@$DOMAIN_NEW $ADMINPASS mail.$DOMAIN_NEW 465 ssl admin@$DOMAIN_NEW $ADMINPASS password" &> /dev/null
+  # Run config.sh - Setup LDAP, configuration for nextcloud
+  docker exec -u 33 nextcloud /var/www/html/config.sh &> /dev/null
+  [ $? -ne 0 ] && fail "Couldn't run config.sh inside /federated/apps/nextcloud container"
+
+  # Add admin user to group
+  # Have to do it this many times so it will query LDAP and populate admin user first
+  docker exec -u 33 nextcloud /var/www/html/occ ldap:search admin
+  docker exec -u 33 nextcloud /var/www/html/occ group:list
+  docker exec -u 33 nextcloud /var/www/html/occ group:adduser admin admin
+  docker exec -u 33 nextcloud /var/www/html/occ group:adduser admin admin
+  docker exec -u 33 nextcloud /var/www/html/occ group:list
+
+  docker exec -it -u 33 nextcloud bash -c "/var/www/html/occ mail:account:create admin admin admin@$DOMAIN_NEW mail.$DOMAIN_NEW 993 ssl admin@$DOMAIN_NEW $ADMINPASS mail.$DOMAIN_NEW 465 ssl admin@$DOMAIN_NEW $ADMINPASS password"
 
   echo -ne "done."
 }