diff --git a/C4/Auth.pm b/C4/Auth.pm
index 8ad1470623..cfe9e80c0e 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -258,6 +258,7 @@ sub get_template_and_user {
 			intranetreadinghistory => C4::Context->preference("intranetreadinghistory"),
 			noItemTypeImages => C4::Context->preference("noItemTypeImages"),
             singleBranchMode => C4::Context->preference("singleBranchMode"),
+			TagsEnabled => C4::Context->preference("TagsEnabled"),
         );
     }
     else {
@@ -316,6 +317,7 @@ sub get_template_and_user {
             singleBranchMode => C4::Context->preference("singleBranchMode"),
             XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"),
             XSLTDetailsDisplay => C4::Context->preference("XSLTDetailsDisplay"),
+			TagsEnabled => C4::Context->preference("TagsEnabled"),
         );
     }
 	$template->param(listloop=>[{shelfname=>"Freelist", shelfnumber=>110}]);
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 8355124b68..9cefd1f3ae 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -3,6 +3,9 @@
         		<!-- TMPL_IF NAME="userview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-user.pl">my summary</a></li>
         		<!-- TMPL_IF NAME="accountview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-account.pl">my fines</a></li>
         		<!-- TMPL_IF NAME="userupdateview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-userupdate.pl">my personal details</a></li>
+				<!-- TMPL_IF NAME="TagsEnabled" -->
+				<!-- TMPL_IF NAME="tagsview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-tags.pl">my tags</a></li>
+				<!-- /TMPL_IF -->
         		<!-- TMPL_IF NAME="OpacPasswordChange" --><!-- TMPL_IF NAME="passwdview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-passwd.pl">change my password</a></li><!-- /TMPL_IF -->
         		<!-- TMPL_IF NAME="opacreadinghistory" --><!-- TMPL_IF NAME="readingrecview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a></li><!-- /TMPL_IF -->
         		<!-- TMPL_IF name="suggestion" --><!-- TMPL_UNLESS NAME="AnonSuggestions" --><!-- TMPL_IF NAME="suggestionsview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-suggestions.pl">my purchase suggestions</a></li><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl
index 0a613d9178..143488eee8 100755
--- a/opac/opac-tags.pl
+++ b/opac/opac-tags.pl
@@ -119,7 +119,7 @@ if ($loggedinuser) {
 		$_->{date_created_display} = format_date($_->{date_created});
 	}
 }
-
+$template->param(tagsview => 1,);
 if ($add_op) {
 	my $adds = 0;
 	for (values %counts) {$adds += $_;}