diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index e7e486dd7..cd6b1c479 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -55,7 +55,8 @@
  - Implemented preview function for posting messages to a forum / RFE[991000] (Leendert Bottelberghs / United Knowledge)
  - RFE [ 923878 ] htmlArea 3 (IE and Mozilla compliant) added to WebGUI (Len
    Kranendonk)
-
+ - RFE [ 806332 ] Force SSL, a new page property "Encrypt page" is added. (Len
+   Kranendonk)
 
 6.1.1
  - bugfix [ 991313 ] Manage Translations doesn't work
diff --git a/docs/upgrades/upgrade_6.1.1-6.2.0.sql b/docs/upgrades/upgrade_6.1.1-6.2.0.sql
index ad28663e0..278ca6b4f 100644
--- a/docs/upgrades/upgrade_6.1.1-6.2.0.sql
+++ b/docs/upgrades/upgrade_6.1.1-6.2.0.sql
@@ -272,4 +272,4 @@ alter table forum add usePreview int(11) NOT NULL default 1;
 INSERT INTO template VALUES (1,'Default Post Preview','<h2><tmpl_var newpost.header></h2>\n\n<h1><tmpl_var post.subject></h1>\n\n<table width=\"100%\">\n<tr>\n<td class=\"content\" valign=\"top\">\n<tmpl_var post.message>\n</td>\n</tr>\n</table>\n\n<tmpl_var form.begin>\n<input type=\"button\" value=\"cancel\" onclick=\"window.history.go(-1)\"><tmpl_var form.submit>\n<tmpl_var form.end>\n','Forum/PostPreview',1,1);
 UPDATE userProfileField SET dataValues = '{\r\n6=>WebGUI::International::get(\'HTMLArea 3\'),\r\n1=>WebGUI::International::get(495), #htmlArea\r\n#2=>WebGUI::International::get(494), #editOnPro2\r\n3=>WebGUI::International::get(887), #midas\r\n4=>WebGUI::International::get(879), #classic\r\n5=>WebGUI::International::get(880),\r\nnone=>WebGUI::International::get(881)\r\n}' WHERE fieldName = 'richEditor';
 INSERT INTO template VALUES ('6','HTMLArea 3 (Mozilla / IE)','<script language=\"JavaScript\"> \r\nfunction fixChars(element) { \r\nelement.value = element.value.replace(/-/mg,\"-\"); \r\n} \r\n</script> \r\n\r\n<tmpl_if htmlArea3.supported> \r\n\r\n<script type=\"text/javascript\"> \r\n_editor_url = \"<tmpl_var session.config.extrasURL>/htmlArea3/\"; \r\n_editor_lang = \"en\"; \r\n</script> \r\n<script type=\"text/javascript\" src=\"<tmpl_var session.config.extrasURL>/htmlArea3/htmlarea.js\"></script> \r\n<script language=\"JavaScript\"> \r\nHTMLArea.loadPlugin(\"TableOperations\"); \r\nHTMLArea.loadPlugin(\"FullPage\"); \r\nfunction initEditor() { \r\n// create an editor for the textbox \r\neditor = new HTMLArea(\"<tmpl_var form.name>\"); \r\n\r\n// register the FullPage plugin \r\neditor.registerPlugin(FullPage); \r\n\r\n// register the SpellChecker plugin \r\neditor.registerPlugin(TableOperations); \r\n\r\nsetTimeout(function() { \r\neditor.generate(); \r\n}, 500); \r\nreturn false; \r\n} \r\nwindow.setTimeout(\"initEditor()\", 250); \r\n</script> \r\n</tmpl_if> \r\n\r\n<tmpl_var textarea> ','richEditor',1,1);
-
+alter table page add encryptPage int(11) default 0;
diff --git a/lib/WebGUI/Navigation.pm b/lib/WebGUI/Navigation.pm
index 1e7da773d..ecf850926 100644
--- a/lib/WebGUI/Navigation.pm
+++ b/lib/WebGUI/Navigation.pm
@@ -218,7 +218,7 @@ in the class and returns HTML.
 sub build {
 	my $self = shift;
 	my @interestingPageProperties = ('pageId', 'parentId', 'title', 'ownerId', 'urlizedTitle',
-			'synopsis', 'newWindow', 'menuTitle');
+			'synopsis', 'newWindow', 'menuTitle', 'encryptLogin');
 	my $var = {'page_loop' => []};
 	my $p = $self->_getStartPageObject();
 	my $method = $self->_methods()->{$self->{_method}}{method};
@@ -251,6 +251,9 @@ sub build {
 
 				# Initial page info
 				$pageData->{"page.url"} = WebGUI::URL::gateway($page->{'urlizedTitle'});
+			        if ($page->{'encryptPage'}) {
+					$pageData->{"page.url"} =~ s/http:/https:/;
+				}
 				$pageData->{"page.absDepth"} = $page->{'depth'} + 1;
 				$pageData->{"page.relDepth"} = $pageData->{"page.absDepth"} - $startPageDepth;
 				$pageData->{"page.isCurrent"} = ($page->{'pageId'} == $session{page}{pageId});
diff --git a/lib/WebGUI/Operation/Package.pm b/lib/WebGUI/Operation/Package.pm
index 81faea331..aa5cacea0 100644
--- a/lib/WebGUI/Operation/Package.pm
+++ b/lib/WebGUI/Operation/Package.pm
@@ -77,6 +77,7 @@ sub _recursePageTree {
 			userDefined5,
 			hideFromNavigation,
 			newWindow,
+			encryptPage,
 			cacheTimeout,
 			cacheTimeoutVisitor,
 			printableStyleId,
@@ -106,6 +107,7 @@ sub _recursePageTree {
 			".quote($newParent{userDefined5}).",
 			$package{hideFromNavigation},
 			$package{newWindow},
+			$package{encryptPage},
 			$package{cacheTimeout},
 			$package{cacheTimeoutVisitor},
 			".quote($package{printableStyleId}).",
diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm
index 8c841b2ff..0ab296bfc 100644
--- a/lib/WebGUI/Operation/Page.pm
+++ b/lib/WebGUI/Operation/Page.pm
@@ -346,6 +346,7 @@ sub www_editPage {
 			$page{ownerId} = $session{user}{userId};
 			$page{hideFromNavigation} = 0;
                         $page{newWindow} = 0;
+                        $page{encryptPage} = 0;
                         $page{redirectURL} = "";
 		} else {
 			%page = %{$session{page}};
@@ -385,6 +386,12 @@ sub www_editPage {
 			-label=>WebGUI::International::get(940),
 			-uiLevel=>6
 			);
+		$f->getTab("properties")->yesNo(
+                        -name=>"encryptPage",
+                        -value=>$page{encryptPage},
+                        -label=>WebGUI::International::get('encrypt page'),
+                        -uiLevel=>6
+                        );
                 $f->getTab("properties")->text(
 			-name=>"urlizedTitle",
 			-label=>WebGUI::International::get(104),
@@ -582,6 +589,7 @@ sub www_editPageSave {
 		groupIdView		=> $session{form}{groupIdView}, 
 		groupIdEdit		=> $session{form}{groupIdEdit}, 
 		newWindow		=> $session{form}{newWindow},
+		encryptPage		=> $session{form}{encryptPage},
 		wobjectPrivileges	=> $session{form}{wobjectPrivileges},
 		hideFromNavigation	=> $session{form}{hideFromNavigation},
 		startDate		=> WebGUI::FormProcessor::dateTime("startDate"),
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index bfc1803b6..5150c86a7 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -7253,8 +7253,11 @@ config file.</p>
                 lastUpdated =>1092748557,
                 context => q|option for Rich Editor in profile|
         },
-
-
+	'encrypt page' => {
+                message => q|Encrypt page?|,
+                lastUpdated =>1092748557,
+                context => q|page property|
+        },
 };
 
 1;