diff --git a/library/src/configuration/cms_configuration.e b/library/src/configuration/cms_configuration.e
index 2c4437b..5e13c4e 100644
--- a/library/src/configuration/cms_configuration.e
+++ b/library/src/configuration/cms_configuration.e
@@ -41,6 +41,7 @@ feature {NONE} -- Initialization
 			get_var_location
 			get_themes_location
 			get_files_location
+			get_smtp
 		end
 
 feature -- Access
@@ -165,6 +166,9 @@ feature -- Access
 			end
 		end
 
+	smtp: detachable READABLE_STRING_8
+
+
 feature -- Change
 
 	get_var_location
@@ -205,6 +209,13 @@ feature -- Change
 			end
 		end
 
+	get_smtp
+		do
+			if attached options.item ("smtp") as s then
+				smtp := s
+			end
+		end
+
 feature {NONE} -- Implementation
 
 	import_from_file (fn: READABLE_STRING_GENERAL)
diff --git a/library/src/configuration/cms_default_setup.e b/library/src/configuration/cms_default_setup.e
index 9185fe5..9932313 100644
--- a/library/src/configuration/cms_default_setup.e
+++ b/library/src/configuration/cms_default_setup.e
@@ -43,6 +43,7 @@ feature {NONE} -- Initialization
 			site_email := configuration.site_email ("webmaster")
 			themes_location := configuration.themes_location
 			theme_name := configuration.theme_name ("default")
+			smtp := configuration.smtp
 
 			debug ("refactor_fixme")
 				fixme ("Review export clause for configuration and layout")
diff --git a/library/src/configuration/cms_setup.e b/library/src/configuration/cms_setup.e
index 54d5f6d..c2223f8 100644
--- a/library/src/configuration/cms_setup.e
+++ b/library/src/configuration/cms_setup.e
@@ -68,6 +68,9 @@ feature -- Access: Site
 			-- Optional path defining the front page.
 			-- By default "" or "/".
 
+	smtp: detachable READABLE_STRING_8
+			-- 	Smtp server
+			
 feature -- Access: Theme	
 
 	themes_location: PATH
diff --git a/library/src/service/response/home_cms_response.e b/library/src/service/response/home_cms_response.e
index f82caec..7985506 100644
--- a/library/src/service/response/home_cms_response.e
+++ b/library/src/service/response/home_cms_response.e
@@ -21,7 +21,7 @@ feature -- Generation
 	custom_prepare (page: CMS_HTML_PAGE)
 		do
 			Precursor (page)
-			page.register_variable (api.recent_nodes (0, 5), "nodes")
+--			page.register_variable (api.recent_nodes (0, 5), "nodes")
 		end
 
 feature -- Execution
@@ -29,7 +29,7 @@ feature -- Execution
 	process
 			-- Computed response message.
 		do
-			set_title ("Home")
+			set_title (Void)
 			set_page_title (Void)
 		end
 end