diff --git a/build/packages-template/bbb-freeswitch-core/before-install.sh b/build/packages-template/bbb-freeswitch-core/before-install.sh
index dc974e19df..13ce133832 100755
--- a/build/packages-template/bbb-freeswitch-core/before-install.sh
+++ b/build/packages-template/bbb-freeswitch-core/before-install.sh
@@ -4,7 +4,7 @@ case "$1" in
     install|upgrade|1|2)
         
         addGroup freeswitch ""
-        addUser freeswitch "" freeswitch /opt/freeswitch "freeswitch" /bin/bash
+        addUser freeswitch "" freeswitch /opt/freeswitch "freeswitch" /usr/sbin/nologin
 
         rm -f /tmp/external.xml
         if [ -f /opt/freeswitch/etc/freeswitch/sip_profiles/external.xml ]; then
diff --git a/build/packages-template/bbb-html5/before-install.sh b/build/packages-template/bbb-html5/before-install.sh
index b22bcb41c7..741d425ae1 100755
--- a/build/packages-template/bbb-html5/before-install.sh
+++ b/build/packages-template/bbb-html5/before-install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 addGroup meteor ""
-addUser meteor "" meteor /usr/share/meteor "meteor user-daemon" "/bin/bash"
+addUser meteor "" meteor /usr/share/meteor "meteor user-daemon" "/usr/sbin/nologin"
 
 case "$1" in
   install|upgrade|1|2)
diff --git a/build/packages-template/bbb-web/before-install.sh b/build/packages-template/bbb-web/before-install.sh
index 8f423769c9..ab3ff589a8 100644
--- a/build/packages-template/bbb-web/before-install.sh
+++ b/build/packages-template/bbb-web/before-install.sh
@@ -3,9 +3,6 @@
 case "$1" in
     install|upgrade|1|2)
         
-        #addGroup bigbluebutton ""
-        #addUser bigbluebutton "" freeswitch /opt/freeswitch "freeswitch" /bin/bash
-
         rm -f /tmp/bigbluebutton.properties
         if [ -f /var/lib/tomcat7/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties ]; then
           mv -f /var/lib/tomcat7/webapps/bigbluebutton/WEB-INF/classes/bigbluebutton.properties /tmp