diff --git a/doc/release-notes/11203-request-access-fixes.md b/doc/release-notes/11203-request-access-fixes.md
new file mode 100644
index 00000000000..7087588c916
--- /dev/null
+++ b/doc/release-notes/11203-request-access-fixes.md
@@ -0,0 +1,2 @@
+Bugs that caused 1) guestbook questions to appear along with terms of use/terms of access in the request access dialog when no guestbook was configured, and 2) terms of access to not be shown when using the per-file request access/download menu items have been fixed.
+Text related to configuring the choice to have guestbooks appear when file access is requested or when files are downloaded has been updated to make it clearer that this only affects datasets where guestbooks have been configured.
\ No newline at end of file
diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 6eb7be67eed..0986240b762 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -72,7 +72,7 @@ affiliation=Affiliation
 storage=Storage
 curationLabels=Curation Labels
 metadataLanguage=Dataset Metadata Language
-guestbookEntryOption=Guestbook Entry Option
+guestbookEntryOption=Guestbook Mode
 pidProviderOption=PID Provider Option
 createDataverse=Create Dataverse
 remove=Remove
@@ -885,7 +885,7 @@ dataverse.curationLabels.title=A set of curation status labels that are used to
 dataverse.curationLabels.disabled=Disabled
 dataverse.category=Category
 dataverse.category.title=The type that most closely reflects this dataverse.
-dataverse.guestbookentryatrequest.title=Whether Guestbooks are displayed to users when they request file access or when they download files.
+dataverse.guestbookentryatrequest.title=Whether Guestbooks (when configured for a dataset) are displayed to users when they request file access or when they download files.
 dataverse.pidProvider.title=The source of PIDs (DOIs, Handles, etc.) when a new PID is created.
 dataverse.type.selectTab.top=Select one...
 dataverse.type.selectTab.researchers=Researcher
diff --git a/src/main/webapp/guestbook-terms-popup-fragment.xhtml b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
index 6eec4f100b1..7d157fcb72c 100644
--- a/src/main/webapp/guestbook-terms-popup-fragment.xhtml
+++ b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
@@ -41,7 +41,7 @@
                         src="#{DatasetUtil:getLicenseIcon(workingVersion)}"
                         title="#{DatasetUtil:getLicenseDescription(workingVersion)}"
                         style="display: none" onload="this.style.display='inline'" />
-                    <a 
+                    <a
                         href="#{DatasetUtil:getLicenseURI(workingVersion)}"
                         title="#{DatasetUtil:getLicenseDescription(workingVersion)}"
                         target="_blank">#{DatasetUtil:getLicenseName(workingVersion)}
@@ -60,7 +60,7 @@
             <div class="form-group"
                 jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfUse}">
                 <label jsf:for="fdTermsOfuse" class="col-sm-3 control-label">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']} 
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
                 </label>
                 <h:outputText id="fdTermsOfUse" class="col-sm-6"
                     value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfUse)}"
@@ -134,7 +134,7 @@
             </div>
         </ui:fragment>
         <div class="form-group"
-            jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess and hasRestrictedFile}">
+            jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess and (hasRestrictedFile or !empty fileDownloadHelper.filesForRequestAccess)}">
             <label jsf:for="fdTermsOfAccess" class="col-sm-3 control-label">
                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
             </label>
@@ -142,7 +142,7 @@
                 value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}"
                 escape="false" />
         </div>
-            <p:fragment rendered="#{guestbookAndTermsPopupRequired and ((termsGuestbookPopupAction != bundle.download) != guestbookPopupRequiredAtDownload)}" id="guestbookUIFragment">
+            <p:fragment rendered="#{guestbookAndTermsPopupRequired and guestbookPopupRequired}" id="guestbookUIFragment">
                 <div class="container messagePanel">
                     <iqbs:messages collapsible="true" />
                 </div>
@@ -179,7 +179,7 @@
                                      styleClass="form-control" value="#{guestbookResponse.email}"
                                      requiredMessage="#{bundle['requiredField']}"
                                      >
-                        </p:inputText>  
+                        </p:inputText>
                         <p:message id="emailMessages" for="guestbookuser_email" display="text"/>
                     </div>
                 </div>