Index: lams_common/db/sql/updatescripts/alter_21_branching.sql
===================================================================
diff -u -r79a6575d49778884cc7d23d028fe14e70ad04a4b -r9e9532e2e87fecf0666a23f81f706b6e2e01f6e4
--- lams_common/db/sql/updatescripts/alter_21_branching.sql	(.../alter_21_branching.sql)	(revision 79a6575d49778884cc7d23d028fe14e70ad04a4b)
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql	(.../alter_21_branching.sql)	(revision 9e9532e2e87fecf0666a23f81f706b6e2e01f6e4)
@@ -137,8 +137,8 @@
 update lams_configuration set description_key='config.temp.dir', header_name='config.header.system', format='STRING', required=1 where config_key='TempDir';
 update lams_configuration set description_key='config.dump.dir', header_name='config.header.system', format='STRING', required=1 where config_key='DumpDir';
 update lams_configuration set description_key='config.ear.dir', header_name='config.header.system', format='STRING', required=1 where config_key='EARDir';
-update lams_configuration set description_key='config.smtp.server', header_name='config.header.email', format='STRING', required=1 where config_key='SMTPServer';
-update lams_configuration set description_key='config.lams.support.email', header_name='config.header.email', format='STRING', required=1 where config_key='LamsSupportEmail';
+update lams_configuration set description_key='config.smtp.server', header_name='config.header.email', format='STRING', required=0 where config_key='SMTPServer';
+update lams_configuration set description_key='config.lams.support.email', header_name='config.header.email', format='STRING', required=0 where config_key='LamsSupportEmail';
 update lams_configuration set description_key='config.content.repository.path', header_name='config.header.uploads', format='STRING', required=1 where config_key='ContentRepositoryPath';
 update lams_configuration set description_key='config.upload.file.max.size', header_name='config.header.uploads', format='LONG', required=1 where config_key='UploadFileMaxSize';
 update lams_configuration set description_key='config.upload.large.file.max.size', header_name='config.header.uploads', format='LONG', required=1 where config_key='UploadLargeFileMaxSize';
@@ -156,10 +156,10 @@
 update lams_configuration set description_key='config.server.page.direction', header_name='config.header.look.feel', format='STRING', required=1 where config_key='ServerPageDirection';
 update lams_configuration set description_key='config.dictionary.date.created', header_name='config.header.versions', format='STRING', required=1 where config_key='DictionaryDateCreated';
 update lams_configuration set description_key='config.help.url', header_name='config.header.system', format='STRING', required=1 where config_key='HelpURL';
-update lams_configuration set description_key='config.xmpp.domain', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppDomain';
-update lams_configuration set description_key='config.xmpp.conference', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppConference';
-update lams_configuration set description_key='config.xmpp.admin', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppAdmin';
-update lams_configuration set description_key='config.xmpp.password', header_name='config.header.chat', format='STRING', required=1 where config_key='XmppPassword';
+update lams_configuration set description_key='config.xmpp.domain', header_name='config.header.chat', format='STRING', required=0 where config_key='XmppDomain';
+update lams_configuration set description_key='config.xmpp.conference', header_name='config.header.chat', format='STRING', required=0 where config_key='XmppConference';
+update lams_configuration set description_key='config.xmpp.admin', header_name='config.header.chat', format='STRING', required=0 where config_key='XmppAdmin';
+update lams_configuration set description_key='config.xmpp.password', header_name='config.header.chat', format='STRING', required=0 where config_key='XmppPassword';
 update lams_configuration set description_key='config.default.flash.theme', header_name='config.header.look.feel', format='STRING', required=1 where config_key='DefaultFlashTheme';
 update lams_configuration set description_key='config.default.html.theme', header_name='config.header.look.feel', format='STRING', required=1 where config_key='DefaultHTMLTheme';
 update lams_configuration set description_key='config.allow.direct.lesson.launch', header_name='config.header.features', format='BOOLEAN', required=1 where config_key='AllowDirectLessonLaunch';