diff --git a/remaster/mcs/desktop/mailware-collaboration.desktop b/remaster/mcs/desktop/mailware-collaboration.desktop
new file mode 100755
index 0000000..21b9dfe
--- /dev/null
+++ b/remaster/mcs/desktop/mailware-collaboration.desktop
@@ -0,0 +1,10 @@
+#!/usr/bin/env xdg-open
+
+[Desktop Entry]
+Version=1.0
+Type=Link
+Icon[en_US]=gnome-panel-launcher
+Name[en_US]=MailWare Collaboration
+URL=http://localhost:8080/MailWare-Collaboration-TrunkVersion/
+Name=MailWare Collaboration
+Icon=nm-device-wired
diff --git a/remaster/mcs/desktop/mailware-manager.desktop b/remaster/mcs/desktop/mailware-manager.desktop
new file mode 100755
index 0000000..028e2b9
--- /dev/null
+++ b/remaster/mcs/desktop/mailware-manager.desktop
@@ -0,0 +1,10 @@
+#!/usr/bin/env xdg-open
+
+[Desktop Entry]
+Version=1.0
+Type=Link
+Icon[en_US]=nm-device-wired
+Name[en_US]=MailWare Manager
+URL=http://localhost:8080/MailWare-Manager
+Name=MailWare Manager
+Icon=nm-device-wired
diff --git a/remaster/mcs/mailware-jboss-conf/login-config.xml.aggregation.babel b/remaster/mcs/mailware-jboss-conf/login-config.xml
similarity index 50%
rename from remaster/mcs/mailware-jboss-conf/login-config.xml.aggregation.babel
rename to remaster/mcs/mailware-jboss-conf/login-config.xml
index 2936c86..aac799d 100644
--- a/remaster/mcs/mailware-jboss-conf/login-config.xml.aggregation.babel
+++ b/remaster/mcs/mailware-jboss-conf/login-config.xml
@@ -1,3 +1,159 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+  <authentication>
+    <login-module code="login.module1.class.name" flag="control_flag">
+      <module-option name = "option1-name">option1-value</module-option>
+      <module-option name = "option2-name">option2-value</module-option>
+      ...
+    </login-module>
+
+    <login-module code="login.module2.class.name" flag="control_flag">
+      ...
+    </login-module>
+    ...
+  </authentication>
+</application-policy>
+
+$Revision: 64598 $
+-->
+
+<policy>
+    <!-- Used by clients within the application server VM such as
+    mbeans and servlets that access EJBs.
+    -->
+    <application-policy name = "client-login">
+       <authentication>
+          <login-module code = "org.jboss.security.ClientLoginModule"
+             flag = "required">
+             <!-- Any existing security context will be restored on logout -->
+             <module-option name="restore-login-identity">true</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domain for JBossMQ -->
+    <application-policy name = "jbossmq">
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+             flag = "required">
+             <module-option name = "unauthenticatedIdentity">guest</module-option>
+             <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+             <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+             <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- Security domain for JBossMQ when using file-state-service.xml
+    <application-policy name = "jbossmq">
+       <authentication>
+          <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
+             flag = "required">
+             <module-option name = "unauthenticatedIdentity">guest</module-option>
+             <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+    -->
+
+    <!-- Security domains for testing new jca framework -->
+    <application-policy name = "HsqlDbRealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">sa</module-option>
+             <module-option name = "userName">sa</module-option>
+             <module-option name = "password"></module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <application-policy name = "JmsXARealm">
+       <authentication>
+          <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+             flag = "required">
+             <module-option name = "principal">guest</module-option>
+             <module-option name = "userName">guest</module-option>
+             <module-option name = "password">guest</module-option>
+             <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the jmx-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "jmx-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+           <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+           <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!-- A template configuration for the web-console web application. This
+      defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name = "web-console">
+       <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required">
+             <module-option name="usersProperties">web-console-users.properties</module-option>
+             <module-option name="rolesProperties">web-console-roles.properties</module-option>
+          </login-module>
+       </authentication>
+    </application-policy>
+
+    <!--
+      A template configuration for the JBossWS security domain.
+      This defaults to the UsersRolesLoginModule the same as other and should be
+      changed to a stronger authentication mechanism as required.
+    -->
+    <application-policy name="JBossWS">
+      <authentication>
+        <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+          flag="required">
+          <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+          <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+          <module-option name="unauthenticatedIdentity">anonymous</module-option>
+        </login-module>
+      </authentication>
+    </application-policy>
+
+    <!-- The default login configuration used by any security domain that
+    does not have a application-policy entry with a matching name
+    -->
+    <application-policy name = "other">
+       <!-- A simple server login module, which can be used when the number
+       of users is relatively small. It uses two properties files:
+       users.properties, which holds users (key) and their password (value).
+       roles.properties, which holds users (key) and a comma-separated list of
+       their roles (value).
+       The unauthenticatedIdentity property defines the name of the principal
+       that will be used when a null username and password are presented as is
+       the case for an unuathenticated web client or MDB. If you want to
+       allow such users to be authenticated add the property, e.g.,
+       unauthenticatedIdentity="nobody"
+       -->
+       <authentication>
+          <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+             flag = "required" />
+       </authentication>
+    </application-policy>
 
     <application-policy name="ucaldav-security-domain">
       <authentication>
diff --git a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
index 7741b9c..7f36050 100755
--- a/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
+++ b/scripts/3rdparty/remaster_mcs_inner_chroot_script_after.sh
@@ -13,8 +13,20 @@ java-config -S sun-jdk || exit 1
 rm /etc/skel/Desktop/*.desktop
 cp /usr/share/applications/keyboard.desktop /etc/skel/Desktop/ -p
 cp /usr/share/applications/389-console*.desktop /etc/skel/Desktop/ -p
+cp /.mcs/desktop/* /etc/skel/Desktop -R
+chmod +x /etc/skel/Desktop/*
 chown root:root /etc/skel/Desktop -R
 
+# Setup Firefox
+rm /etc/skel/.mozilla/firefox/*/bookmarks.html
+for file in `find /etc/skel/.mozilla -name prefs.js`; do
+	sed -i 's:sabayon.org:babel.it:g' "${file}"
+done
+
+mkdir -p /etc/skel/.local/share/applications
+echo "[Added Associations]" >> /etc/skel/.local/share/applications/mimeapps.list
+echo "application/octet-stream=mozilla-firefox-3.6.desktop;" >> /etc/skel/.local/share/applications/mimeapps.list
+
 # Setup init scripts
 cp /.mcs/mcs-functions.sh /sbin/mcs-functions.sh
 chmod 755 /sbin/mcs-functions.sh
@@ -96,7 +108,7 @@ chown jboss:jboss /opt/jboss-bin-4.2/server/default/deploy/ -R || exit 1
 rm -r /tmp/jboss-deploy || exit 1
 
 # setup jboss login info
-cat /.mcs/mailware-jboss-conf/login-config.xml.aggregation.babel >> /opt/jboss-bin-4.2/server/default/conf/login-config.xml || exit 1
+cp /.mcs/mailware-jboss-conf/login-config.xml /opt/jboss-bin-4.2/server/default/conf/login-config.xml || exit 1
 chown jboss:jboss /opt/jboss-bin-4.2/server/default/conf/login-config.xml || exit 1
 cp /.mcs/mailware-jboss-conf/jboss-log4j.xml /opt/jboss-bin-4.2/server/default/conf/jboss-log4j.xml || exit 1
 chown jboss:jboss /opt/jboss-bin-4.2/server/default/conf/jboss-log4j.xml || exit 1