Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -r727b3ae9ac5890d92d64a7330d058ff3a82c8a51 -r83fea63e7656186a4c9f3adc6006b1999670e37d
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 727b3ae9ac5890d92d64a7330d058ff3a82c8a51)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 83fea63e7656186a4c9f3adc6006b1999670e37d)
@@ -14,7 +14,7 @@
 values ('DumpDir','/var/opt/lams/dump', 'config.dump.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear', 'config.ear.dir', 'config.header.system', 'STRING', 1);
+values ('EARDir','/usr/local/jboss-4.0.2/server/default/deploy/lams.ear/', 'config.ear.dir', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('SMTPServer','', 'config.smtp.server', 'config.header.email', 'STRING', 0);
@@ -240,3 +240,9 @@
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 1);
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -r727b3ae9ac5890d92d64a7330d058ff3a82c8a51 -r83fea63e7656186a4c9f3adc6006b1999670e37d
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 727b3ae9ac5890d92d64a7330d058ff3a82c8a51)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 83fea63e7656186a4c9f3adc6006b1999670e37d)
@@ -240,3 +240,9 @@
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 1);
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
===================================================================
diff -u -r1fe0f4f546903187be6f35e4d5c027853da9408c -r83fea63e7656186a4c9f3adc6006b1999670e37d
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	(.../patch0015_updateFrom22.sql)	(revision 1fe0f4f546903187be6f35e4d5c027853da9408c)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql	(.../patch0015_updateFrom22.sql)	(revision 83fea63e7656186a4c9f3adc6006b1999670e37d)
@@ -14,6 +14,14 @@
 ALTER TABLE lams_learning_design ADD COLUMN first_activity_id BIGINT(20);
 CREATE INDEX idx_design_floating_act ON lams_learning_design (floating_activity_id ASC);
 
+-- LDEV-1983 --------------
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPUser','', 'config.smtp.user', 'config.header.email', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('SMTPPassword','', 'config.smtp.password', 'config.header.email', 'STRING', 1);
+
+
 ----------------------Put all sql statements above here-------------------------
 
 -- If there were no errors, commit and restore autocommit to on