diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index b652cc0be..a145bb509 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -18,6 +18,7 @@
  - fix: can't turn off Is Group Admin setting
  - Check correct IP for spectre connections
  - Inbox messages sent by Data Forms add sent by user
+ - Hide encryption settings for edit branch when SSL disabled
 
 7.4.5
  - fix: Apostrophy incorrectly escaped as double quote in some places
diff --git a/lib/WebGUI/AssetBranch.pm b/lib/WebGUI/AssetBranch.pm
index bfdce3545..bc50b823f 100644
--- a/lib/WebGUI/AssetBranch.pm
+++ b/lib/WebGUI/AssetBranch.pm
@@ -159,7 +159,8 @@ sub www_editBranch {
 		-subtext=>'<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_printableStyleTemplateId"})
 		);
 	$tabform->addTab("security",$i18n->get(107),6);
-        $tabform->getTab("security")->yesNo(
+        if ($self->session->config->get("sslEnabled")) {
+            $tabform->getTab("security")->yesNo(
                 -name=>"encryptPage",
                 -value=>$self->get("encryptPage"),
                 -label=>$i18n->get('encrypt page'),
@@ -167,6 +168,7 @@ sub www_editBranch {
                 -uiLevel=>6,
 		-subtext=>'<br />'.$i18n->get("change").' '.WebGUI::Form::yesNo($self->session,{name=>"change_encryptPage"})
                 );
+        }
 	my $subtext;
         if ($self->session->user->isInGroup(3)) {
                  $subtext = $self->session->icon->manage('op=listUsers');
@@ -305,6 +307,13 @@ sub www_editBranchSave {
                 	}
         	}
 	}
+	if ($self->session->setting->get("autoRequestCommit")) {
+        if ($self->session->setting->get("skipCommitComments")) {
+            WebGUI::VersionTag->getWorking($self->session)->requestCommit;
+        } else {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        }
+	}
 	delete $self->{_parent};
 	$self->session->asset($self->getParent);
 	return $self->getParent->www_manageAssets;