diff --git a/swad_MFU.c b/swad_MFU.c
index 404d97f7..b927ae03 100644
--- a/swad_MFU.c
+++ b/swad_MFU.c
@@ -249,7 +249,8 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
 		  Gbl.Prefs.URLIconSet,
 		  Act_GetIcon (Action),
 		  MenuStr);
-         fprintf (Gbl.F.Out," %s</a>",TabMenuStr);
+         fprintf (Gbl.F.Out," %s",TabMenuStr);
+         Frm_LinkFormEnd ();
          Frm_EndForm ();
          HTM_LI_End ();
         }
@@ -280,9 +281,8 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
    HTM_DIV_Begin ("id=\"MFU_actions\"");
    Frm_StartForm (ActMFUAct);
    Frm_LinkFormSubmit (Txt_My_frequent_actions,NULL,NULL);
-   fprintf (Gbl.F.Out," %s"
-	              "</a>",
-	    Txt_Frequent_ACTIONS);
+   fprintf (Gbl.F.Out," %s",Txt_Frequent_ACTIONS);
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
 
    /***** Write list of frequently used actions *****/
@@ -312,7 +312,8 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
                   Gbl.Prefs.URLIconSet,
                   Act_GetIcon (Action),
                   MenuStr);
-	 fprintf (Gbl.F.Out," %s</a>",MenuStr);
+	 fprintf (Gbl.F.Out," %s",MenuStr);
+	 Frm_LinkFormEnd ();
          Frm_EndForm ();
          HTM_LI_End ();
         }
diff --git a/swad_changelog.h b/swad_changelog.h
index 4dc632b6..8d5ea022 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -487,14 +487,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
 En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
-#define Log_PLATFORM_VERSION	"SWAD 19.45.1 (2019-10-27)"
+#define Log_PLATFORM_VERSION	"SWAD 19.45.2 (2019-10-27)"
 #define CSS_FILE		"swad19.45.css"
 #define JS_FILE			"swad19.39.js"
 /*
 // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
 // TODO: Impedir la creación y edición de proyectos si no son editables.
-// TODO: Cambiar </a> por Frm_LinkFormEnd (); a partir de swad_layout incluido.
 
+	Version 19.45.2:  Oct 27, 2019	Code refactoring in HTML forms. (246498 lines)
 	Version 19.45.1:  Oct 27, 2019	Code refactoring in HTML forms. (246481 lines)
 	Version 19.45:    Oct 26, 2019	Code refactoring in HTML lists. (246444 lines)
 	Version 19.44.4:  Oct 26, 2019	Fixed bug in HTML divs. (246370 lines)
diff --git a/swad_layout.c b/swad_layout.c
index 42c0cf44..8f5a9a0b 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -934,27 +934,26 @@ static void Lay_WritePageTopHeading (void)
    Frm_LinkFormSubmit (Txt_System,NULL,NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
                       " class=\"CM\""
-	              " style=\"width:%upx; height:%upx;\" />"
-                      "</a>",	// head_row_1_logo_small
+	              " style=\"width:%upx; height:%upx;\" />",
             Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
             Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
             Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
-   HTM_DIV_End ();
+   Frm_LinkFormEnd ();
+   HTM_DIV_End ();	// head_row_1_logo_small
    HTM_DIV_Begin ("id=\"head_row_1_logo_big\"");
    Frm_LinkFormSubmit (Txt_System,NULL,NULL);
    fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
                       " class=\"CM\""
-	              " style=\"width:%upx; height:%upx;\" />"
-                      "</a>",	// head_row_1_logo_big
+	              " style=\"width:%upx; height:%upx;\" />",
             Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_BIG_FILENAME,
             Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
             Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
-   HTM_DIV_End ();
+   Frm_LinkFormEnd ();
+   HTM_DIV_End ();	// head_row_1_logo_big
    HTM_DIV_Begin ("id=\"head_row_1_tagline\"");
    Frm_LinkFormSubmit (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL);
-   fprintf (Gbl.F.Out,"%s"
-	              "</a>",
-            Txt_TAGLINE_BR);
+   fprintf (Gbl.F.Out,"%s",Txt_TAGLINE_BR);
+   Frm_LinkFormEnd ();
    HTM_DIV_End ();	// head_row_1_tagline
 
    /* End form to go to home page */
@@ -1209,7 +1208,7 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
    /***** Put icon and text with link *****/
    Frm_LinkFormSubmit (Text,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL);
    Ico_PutIconTextLink (Icon,Text);
-   fprintf (Gbl.F.Out,"</a>");
+   Frm_LinkFormEnd ();
 
    /***** End form *****/
    Frm_EndForm ();
@@ -1243,7 +1242,7 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *
    /***** Put icon with link *****/
    Frm_LinkFormSubmit (Text,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
    Ico_PutIconTextLink (Icon,Text);
-   fprintf (Gbl.F.Out,"</a>");
+   Frm_LinkFormEnd ();
 
    /***** End form *****/
    Frm_EndForm ();
@@ -1447,7 +1446,9 @@ static void Lay_WriteAboutZone (void)
    /***** Questions and problems *****/
    HTM_DIV_Begin (NULL);
    fprintf (Gbl.F.Out,"%s: "
-		      "<a href=\"mailto:%s\" class=\"ABOUT\" target=\"_blank\">%s</a>",
+		      "<a href=\"mailto:%s\" class=\"ABOUT\" target=\"_blank\">"
+		      "%s"
+		      "</a>",
 	    Txt_Questions_and_problems,
 	    Cfg_PLATFORM_RESPONSIBLE_EMAIL,Cfg_PLATFORM_RESPONSIBLE_EMAIL);
    HTM_DIV_End ();
diff --git a/swad_link.c b/swad_link.c
index 0a9cc5be..b4a750bc 100644
--- a/swad_link.c
+++ b/swad_link.c
@@ -166,9 +166,8 @@ void Lnk_WriteMenuWithInstitutionalLinks (void)
 
       Frm_StartForm (ActSeeLnk);
       Frm_LinkFormSubmit (Txt_Links,NULL,NULL);
-      fprintf (Gbl.F.Out," %s"
-			 "</a>",
-	       Txt_Links);
+      fprintf (Gbl.F.Out," %s",Txt_Links);
+      Frm_LinkFormEnd ();
       Frm_EndForm ();
 
       Lnk_WriteListOfLinks ();
diff --git a/swad_mail.c b/swad_mail.c
index c38b88ae..ec296ad7 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -143,7 +143,7 @@ void Mai_SeeMailDomains (void)
       fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Order]);
       if (Order == Gbl.Mails.SelectedOrder)
          fprintf (Gbl.F.Out,"</u>");
-      fprintf (Gbl.F.Out,"</a>");
+      Frm_LinkFormEnd ();
       Frm_EndForm ();
 
       HTM_TH_End ();
diff --git a/swad_match.c b/swad_match.c
index 43cc8b88..2e55146f 100644
--- a/swad_match.c
+++ b/swad_match.c
@@ -1225,7 +1225,7 @@ static void Mch_PutFormNewMatch (struct Game *Game)
 		      " alt=\"%s\" title=\"%s\""
 	              " class=\"CONTEXT_OPT ICO_HIGHLIGHT ICO64x64\" />",
             Cfg_URL_ICON_PUBLIC,Txt_Play,Txt_Play);
-   fprintf (Gbl.F.Out,"</a>");
+   Frm_LinkFormEnd ();
 
    /***** End box *****/
    Box_BoxEnd ();
diff --git a/swad_menu.c b/swad_menu.c
index baaf21d0..d2c912fa 100644
--- a/swad_menu.c
+++ b/swad_menu.c
@@ -368,19 +368,17 @@ void Mnu_WriteMenuThisTab (void)
          Frm_StartForm (NumAct);
          Frm_LinkFormSubmit (Title,The_ClassTxtMenu[Gbl.Prefs.Theme],NULL);
 
-         /***** Icon *****/
+         /***** Icon and text *****/
 	 HTM_DIV_Begin ("class=\"MENU_ICO\" style=\"background-image:url('%s/%s');\"",
 			Gbl.Prefs.URLIconSet,
 			Act_GetIcon (NumAct));
-
-         /***** Text *****/
 	 HTM_DIV_Begin ("class=\"MENU_TEXT %s\"",The_ClassTxtMenu[Gbl.Prefs.Theme]);
 	 fprintf (Gbl.F.Out,"%s",Txt_MENU_TITLE[Gbl.Action.Tab][NumOptInMenu]);
 	 HTM_DIV_End ();
+	 HTM_DIV_End ();
 
          /***** End link and form *****/
-	 HTM_DIV_End ();
-         fprintf (Gbl.F.Out,"</a>");
+         Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 
          /***** End container used to highlight this option *****/
diff --git a/swad_message.c b/swad_message.c
index a0092f7a..527e6bc1 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -3183,7 +3183,7 @@ static void Msg_WriteSentOrReceivedMsgSubject (long MsgCod,const char *Subject,b
       fprintf (Gbl.F.Out,"[%s]",Txt_no_subject);
 
    /***** End form to expand the message *****/
-   fprintf (Gbl.F.Out,"</a>");
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
 
    /***** End cell *****/
@@ -3300,8 +3300,9 @@ bool Msg_WriteCrsOrgMsg (long CrsCod)
         	      Txt_Go_to_X,
 		      Crs.FullName);
             Frm_LinkFormSubmit (Gbl.Title,"AUTHOR_TXT",NULL);
-            fprintf (Gbl.F.Out,"%s</a>)",
-        	     Crs.ShrtName);
+            fprintf (Gbl.F.Out,"%s",Crs.ShrtName);
+            Frm_LinkFormEnd ();
+            fprintf (Gbl.F.Out,")");
             HTM_DIV_End ();
             Frm_EndForm ();
            }
@@ -3594,7 +3595,7 @@ static void Msg_WriteMsgTo (long MsgCod)
          Frm_LinkFormSubmit (Txt_View_all_recipients,"AUTHOR_TXT",NULL);
          fprintf (Gbl.F.Out,Txt_and_X_other_recipients,
                   NumRecipientsKnown - NumRecipientsToShow);
-         fprintf (Gbl.F.Out,"</a>");
+         Frm_LinkFormEnd ();
          Frm_EndForm ();
          HTM_TD_End ();
 
diff --git a/swad_notice.c b/swad_notice.c
index 81102fed..e0117721 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -698,7 +698,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
             UniqueId);
    if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES)
      {
-      fprintf (Gbl.F.Out,"</a>");
+      Frm_LinkFormEnd ();
       Frm_EndForm ();
      }
    fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
diff --git a/swad_notification.c b/swad_notification.c
index 8fff1f0d..02e50506 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -495,8 +495,8 @@ void Ntf_ShowMyNotifications (void)
          if (PutLink)
            {
             Frm_LinkFormSubmit (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassAnchor,NULL);
-            fprintf (Gbl.F.Out,"%s</a>",
-                     Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
+            fprintf (Gbl.F.Out,"%s",Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
+            Frm_LinkFormEnd ();
             Frm_EndForm ();
            }
          else
@@ -524,7 +524,7 @@ void Ntf_ShowMyNotifications (void)
             fprintf (Gbl.F.Out,"%s: %s",Txt_Forum,ForumName);
             if (PutLink)
               {
-               fprintf (Gbl.F.Out,"</a>");
+               Frm_LinkFormEnd ();
                Frm_EndForm ();
               }
             else
@@ -553,7 +553,7 @@ void Ntf_ShowMyNotifications (void)
 
             if (PutLink)
               {
-               fprintf (Gbl.F.Out,"</a>");
+               Frm_LinkFormEnd ();
                Frm_EndForm ();
               }
             else
@@ -2070,7 +2070,7 @@ void Ntf_WriteNumberOfNewNtfs (void)
 				 Txt_NOTIF_new_PLURAL);
 
    /***** End form *****/
-   fprintf (Gbl.F.Out,"</a>");
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
   }
 
diff --git a/swad_pagination.c b/swad_pagination.c
index 176149ed..148b94a3 100644
--- a/swad_pagination.c
+++ b/swad_pagination.c
@@ -249,7 +249,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
          fprintf (Gbl.F.Out,"[%s]",Txt_FORUM_Post_banned);
       if (LinkToPagCurrent)
 	{
-	 fprintf (Gbl.F.Out,"</a>");
+	 Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 	}
       else
@@ -351,8 +351,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                    Txt_Page_X_of_Y,
                    1,Pagination->NumPags);
          Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL);
-         fprintf (Gbl.F.Out,"1"
-                            "</a>");
+         fprintf (Gbl.F.Out,"1");
+         Frm_LinkFormEnd ();
          Frm_EndForm ();
          if (Pagination->LeftPage > 2)
             fprintf (Gbl.F.Out,"<span class=\"%s\">&hellip;</span>",Font);
@@ -447,8 +447,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                    Pagination->LeftPage,
                    Pagination->NumPags);
          Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL);
-         fprintf (Gbl.F.Out,"%u</a>",
-                  Pagination->LeftPage);
+         fprintf (Gbl.F.Out,"%u",Pagination->LeftPage);
+         Frm_LinkFormEnd ();
          Frm_EndForm ();
          if (Pagination->LeftPage < Pagination->StartPage - 1)
             fprintf (Gbl.F.Out,"<span class=\"%s\">&hellip;</span>",Font);
@@ -550,8 +550,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                   break;
               }
             Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL);
-            fprintf (Gbl.F.Out,"%u</a>",
-                     NumPage);
+            fprintf (Gbl.F.Out,"%u",NumPage);
+            Frm_LinkFormEnd ();
             Frm_EndForm ();
            }
         }
@@ -646,7 +646,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                    Txt_Page_X_of_Y,
                    Pagination->RightPage,Pagination->NumPags);
          Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL);
-         fprintf (Gbl.F.Out,"%u</a>",Pagination->RightPage);
+         fprintf (Gbl.F.Out,"%u",Pagination->RightPage);
+         Frm_LinkFormEnd ();
          Frm_EndForm ();
         }
 
@@ -739,7 +740,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
                    Txt_Page_X_of_Y,
                    Pagination->NumPags,Pagination->NumPags);
          Frm_LinkFormSubmit (Gbl.Title,LinkStyle,NULL);
-         fprintf (Gbl.F.Out,"%u</a>",Pagination->NumPags);
+         fprintf (Gbl.F.Out,"%u",Pagination->NumPags);
+         Frm_LinkFormEnd ();
          Frm_EndForm ();
         }
      }
diff --git a/swad_photo.c b/swad_photo.c
index bdbc3675..e968fc83 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1301,7 +1301,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
    /***** End form to go to public profile *****/
    if (PutLinkToPublicProfile)
      {
-      fprintf (Gbl.F.Out,"</a>");
+      Frm_LinkFormEnd ();
       Frm_EndForm ();
      }
   }
@@ -2258,7 +2258,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
 	 else	// Pho_DEGREES_PRINT
 	   {
 	    Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
-	    fprintf (Gbl.F.Out,"&nbsp;%s</a>",Deg.FullName);
+	    fprintf (Gbl.F.Out,"&nbsp;%s",Deg.FullName);
 	   }
 	 HTM_TD_End ();
 
@@ -2529,7 +2529,7 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,
    HTM_DIV_End ();
    if (SeeOrPrint == Pho_DEGREES_SEE)
      {
-      fprintf (Gbl.F.Out,"</a>");
+      Frm_LinkFormEnd ();
       Frm_EndForm ();
      }
   }
diff --git a/swad_place.c b/swad_place.c
index 3584d719..eb710596 100644
--- a/swad_place.c
+++ b/swad_place.c
@@ -129,7 +129,7 @@ void Plc_SeePlaces (void)
 	 fprintf (Gbl.F.Out,"%s",Txt_PLACES_ORDER[Order]);
 	 if (Order == Gbl.Plcs.SelectedOrder)
 	    fprintf (Gbl.F.Out,"</u>");
-	 fprintf (Gbl.F.Out,"</a>");
+	 Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 
 	 HTM_TH_End ();
diff --git a/swad_profile.c b/swad_profile.c
index 35a30ec9..d0a08ad3 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -964,7 +964,8 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
    Sco_PutParamScope ("ScopeSta",Hie_SYS);
    Par_PutHiddenParamUnsigned ("FigureType",(unsigned) Fig_USERS_RANKING);
    Frm_LinkFormSubmit (Gbl.Title,The_ClassFormOutBox[Gbl.Prefs.Theme],NULL);
-   fprintf (Gbl.F.Out,"#%lu</a>",Rank);
+   fprintf (Gbl.F.Out,"#%lu",Rank);
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
   }
 
@@ -1778,7 +1779,7 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
       HTM_DIV_Begin ("class=\"RANK_USR\"");	// Limited width
       Frm_LinkFormSubmit (Txt_Another_user_s_profile,"DAT_SMALL",NULL);
       Usr_WriteFirstNameBRSurnames (UsrDat);
-      fprintf (Gbl.F.Out,"</a>");
+      Frm_LinkFormEnd ();
       HTM_DIV_End ();
       Frm_EndForm ();
      }
diff --git a/swad_project.c b/swad_project.c
index 43bb422f..3eaa41d9 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -818,7 +818,7 @@ static void Prj_ShowProjectsHead (Prj_ProjectView_t ProjectView)
             fprintf (Gbl.F.Out,"%s",Txt_PROJECT_ORDER[Order]);
 	    if (Order == Gbl.Prjs.SelectedOrder)
 	       fprintf (Gbl.F.Out,"</u>");
-	    fprintf (Gbl.F.Out,"</a>");
+	    Frm_LinkFormEnd ();
 	    Frm_EndForm ();
 	    break;
 	 default:
@@ -1163,7 +1163,8 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
 	 Frm_StartForm (ActAdmDocPrj);
 	 Prj_PutCurrentParams ();
 	 Frm_LinkFormSubmit (Txt_Project_files,ClassTitle,NULL);
-	 fprintf (Gbl.F.Out,"%s</a>",Prj->Title);
+	 fprintf (Gbl.F.Out,"%s",Prj->Title);
+	 Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 	}
       else
diff --git a/swad_record.c b/swad_record.c
index c7746200..cf854bcc 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1494,8 +1494,8 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
    Frm_LinkFormSubmit (Txt_Print,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL);
    Ico_PutIconTextLink ("print.svg",
 			Txt_Print);
-   fprintf (Gbl.F.Out,"</a>"
-                      "<label class=\"%s\">"
+   Frm_LinkFormEnd ();
+   fprintf (Gbl.F.Out,"<label class=\"%s\">"
                       "(<select name=\"RecsPerPag\">",
 	    The_ClassFormInBox[Gbl.Prefs.Theme]);
    for (i = Rec_MIN_RECORDS_PER_PAGE;
@@ -2702,7 +2702,7 @@ static void Rec_ShowInstitutionInHead (struct Instit *Ins,bool PutFormLinks)
                     Rec_INSTITUTION_LOGO_SIZE,NULL,true);
       if (PutFormLinks)
 	{
-         fprintf (Gbl.F.Out,"</a>");
+         Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 	}
      }
@@ -2722,7 +2722,7 @@ static void Rec_ShowInstitutionInHead (struct Instit *Ins,bool PutFormLinks)
       fprintf (Gbl.F.Out,"%s",Ins->FullName);
       if (PutFormLinks)
 	{
-         fprintf (Gbl.F.Out,"</a>");
+         Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 	}
      }
@@ -2795,7 +2795,7 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
       fprintf (Gbl.F.Out,"@%s",UsrDat->Nickname);
       if (PutFormLinks)
 	{
-	 fprintf (Gbl.F.Out,"</a>");
+	 Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 	}
      }
@@ -3463,7 +3463,9 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,
 		  Usr_MAX_CHARS_PHONE,
 		  UsrDat->LocalPhone);
       else if (UsrDat->LocalPhone[0])
-	 fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">%s</a>",
+	 fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">"
+	                    "%s"
+	                    "</a>",
 	          UsrDat->LocalPhone,
 	          UsrDat->LocalPhone);
      }
@@ -3539,7 +3541,9 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
 		  Usr_MAX_CHARS_PHONE,
 		  UsrDat->FamilyPhone);
       else if (UsrDat->FamilyPhone[0])
-	 fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">%s</a>",
+	 fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">"
+	                    "%s"
+	                    "</a>",
 	          UsrDat->FamilyPhone,
 	          UsrDat->FamilyPhone);
      }
@@ -3756,7 +3760,9 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat,
 
    HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
    if (ShowData)
-      fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">%s</a>",
+      fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">"
+	                 "%s"
+	                 "</a>",
 	       UsrDat->Tch.OfficePhone,
 	       UsrDat->Tch.OfficePhone);
    HTM_TD_End ();
@@ -3773,7 +3779,9 @@ static void Rec_WriteLinkToDataProtectionClause (void)
    extern const char *Txt_DATA_PROTECTION_CLAUSE;
 
    HTM_DIV_Begin ("class=\"CM\"");
-   fprintf (Gbl.F.Out,"<a class=\"TIT\" href=\"%s/\" target=\"_blank\">%s</a>",
+   fprintf (Gbl.F.Out,"<a class=\"TIT\" href=\"%s/\" target=\"_blank\">"
+	              "%s"
+	              "</a>",
             Cfg_URL_DATA_PROTECTION_PUBLIC,
             Txt_DATA_PROTECTION_CLAUSE);
    HTM_DIV_End ();
diff --git a/swad_statistic.c b/swad_statistic.c
index 4d74275d..996c259e 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -1607,8 +1607,8 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
 	        Txt_Show_previous_X_clicks,
                 Gbl.Stat.RowsPerPage);
       Frm_LinkFormSubmit (Gbl.Title,"TIT_TBL",NULL);
-      fprintf (Gbl.F.Out,"<strong>&lt;%s</strong></a>",
-               Txt_PAGES_Previous);
+      fprintf (Gbl.F.Out,"<strong>&lt;%s</strong>",Txt_PAGES_Previous);
+      Frm_LinkFormEnd ();
      }
    HTM_TD_End ();
    if (FirstRow > 1)
@@ -1643,9 +1643,8 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
 	        Txt_Show_next_X_clicks,
                 Gbl.Stat.RowsPerPage);
       Frm_LinkFormSubmit (Gbl.Title,"TIT_TBL",NULL);
-      fprintf (Gbl.F.Out,"<strong>%s&gt;</strong>"
-	                 "</a>",
-               Txt_PAGES_Next);
+      fprintf (Gbl.F.Out,"<strong>%s&gt;</strong>",Txt_PAGES_Next);
+      Frm_LinkFormEnd ();
      }
    HTM_TD_End ();
    if (LastRow < NumRows)
@@ -3782,9 +3781,8 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
                    Txt_Go_to_X,
 		   Crs.FullName);
          Frm_LinkFormSubmit (Gbl.Title,"LOG",NULL);
-         fprintf (Gbl.F.Out,"%s"
-                            "</a>",
-                  Crs.ShrtName);
+         fprintf (Gbl.F.Out,"%s",Crs.ShrtName);
+         Frm_LinkFormEnd ();
         }
       else
          fprintf (Gbl.F.Out,"-");
diff --git a/swad_survey.c b/swad_survey.c
index 1dec1055..5b4ce8b1 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -266,7 +266,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
 	 fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Order]);
 	 if (Order == Gbl.Svys.SelectedOrder)
 	    fprintf (Gbl.F.Out,"</u>");
-	 fprintf (Gbl.F.Out,"</a>");
+	 Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 
 	 HTM_TH_End ();
@@ -531,8 +531,8 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
    Frm_LinkFormSubmit (Txt_View_survey,
                        Svy.Status.Visible ? "ASG_TITLE" :
 	                                    "ASG_TITLE_LIGHT",NULL);
-   fprintf (Gbl.F.Out,"%s</a>",
-            Svy.Title);
+   fprintf (Gbl.F.Out,"%s",Svy.Title);
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
    HTM_ARTICLE_End ();
 
diff --git a/swad_tab.c b/swad_tab.c
index 3a40558c..1020648c 100644
--- a/swad_tab.c
+++ b/swad_tab.c
@@ -147,7 +147,7 @@ void Tab_DrawTabs (void)
 						   The_ClassTxtTabOff[Gbl.Prefs.Theme]);
 	 fprintf (Gbl.F.Out,"%s",Txt_TABS_TXT[NumTab]);
 	 HTM_DIV_End ();
-	 fprintf (Gbl.F.Out,"</a>");
+	 Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 
 	 HTM_DIV_End ();
diff --git a/swad_test.c b/swad_test.c
index 476d21da..b1f3b42d 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -2855,7 +2855,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
         {
          if (Order == Gbl.Test.SelectedOrder)
             fprintf (Gbl.F.Out,"</u>");
-         fprintf (Gbl.F.Out,"</a>");
+         Frm_LinkFormEnd ();
          Frm_EndForm ();
         }
 
diff --git a/swad_timeline.c b/swad_timeline.c
index 1d0c98b7..7bbb5ef1 100644
--- a/swad_timeline.c
+++ b/swad_timeline.c
@@ -1722,7 +1722,8 @@ static void TL_WriteTopMessage (TL_TopMessage_t TopMessage,long UsrCod)
 	 Frm_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
 					   Txt_Another_user_s_profile,
 				   "TL_TOP_PUBLISHER");
-	 fprintf (Gbl.F.Out,"%s</a>",UsrDat.FullName);
+	 fprintf (Gbl.F.Out,"%s",UsrDat.FullName);
+	 Frm_LinkFormEnd ();
 	 Frm_EndForm ();
 
 	 /***** Show action made *****/
@@ -1754,7 +1755,8 @@ static void TL_WriteAuthorNote (const struct UsrData *UsrDat)
    Frm_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
 				     Txt_Another_user_s_profile,
 			     "DAT_N_BOLD");
-   fprintf (Gbl.F.Out,"%s</a>",UsrDat->FullName);
+   fprintf (Gbl.F.Out,"%s",UsrDat->FullName);
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
 
    /***** Show user's nickname inside form to go to user's public profile *****/
@@ -1763,7 +1765,8 @@ static void TL_WriteAuthorNote (const struct UsrData *UsrDat)
    Frm_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
 				     Txt_Another_user_s_profile,
 			     "DAT_LIGHT");
-   fprintf (Gbl.F.Out," @%s</a>",UsrDat->Nickname);
+   fprintf (Gbl.F.Out," @%s",UsrDat->Nickname);
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
 
    HTM_DIV_End ();
@@ -2032,12 +2035,12 @@ static void TL_PutFormGoToAction (const struct TL_Note *SocNot)
       fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
 	                 " alt=\"%s\" title=\"%s\""
 	                 " class=\"CONTEXT_ICO_x16\" />"
-	                 "&nbsp;%s"
-	                 "</a>",
+	                 "&nbsp;%s",
             Cfg_URL_ICON_PUBLIC,TL_Icons[SocNot->NoteType],
             Txt_TIMELINE_NOTE[SocNot->NoteType],
             Txt_TIMELINE_NOTE[SocNot->NoteType],
             Txt_TIMELINE_NOTE[SocNot->NoteType]);
+      Frm_LinkFormEnd ();
       Frm_EndForm ();
 
       HTM_DIV_End ();
@@ -2843,7 +2846,8 @@ static void TL_WriteAuthorComment (struct UsrData *UsrDat)
    Frm_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
 				     Txt_Another_user_s_profile,
 			     "DAT_BOLD");
-   fprintf (Gbl.F.Out,"%s</a>",UsrDat->FullName);
+   fprintf (Gbl.F.Out,"%s",UsrDat->FullName);
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
 
    /***** Show user's nickname inside form to go to user's public profile *****/
@@ -2852,7 +2856,8 @@ static void TL_WriteAuthorComment (struct UsrData *UsrDat)
    Frm_LinkFormSubmitUnique (ItsMe ? Txt_My_public_profile :
 				     Txt_Another_user_s_profile,
 			     "DAT_LIGHT");
-   fprintf (Gbl.F.Out," @%s</a>",UsrDat->Nickname);
+   fprintf (Gbl.F.Out," @%s",UsrDat->Nickname);
+   Frm_LinkFormEnd ();
    Frm_EndForm ();
 
    /***** End container *****/
diff --git a/swad_user.c b/swad_user.c
index 64d4e4df..6cb49704 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -2817,8 +2817,8 @@ void Usr_WriteLoggedUsrHead (void)
      {
       Frm_StartForm (ActFrmRolSes);
       Frm_LinkFormSubmit (Txt_Role,The_ClassUsr[Gbl.Prefs.Theme],NULL);
-      fprintf (Gbl.F.Out,"%s</a>",
-               Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
+      fprintf (Gbl.F.Out,"%s",Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
+      Frm_LinkFormEnd ();
       Frm_EndForm ();
       fprintf (Gbl.F.Out,":&nbsp;");
      }
@@ -6144,12 +6144,13 @@ static void Usr_FormToSelectUsrListType (void (*FuncParams) (void),
    fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
                       " alt=\"%s\" title=\"%s\""
                       " class=\"ICO20x20\" />"
-                      " %s</a>",
+                      " %s",
             Cfg_URL_ICON_PUBLIC,
             Usr_IconsClassPhotoOrList[ListType],
             Txt_USR_LIST_TYPES[ListType],
             Txt_USR_LIST_TYPES[ListType],
             Txt_USR_LIST_TYPES[ListType]);
+   Frm_LinkFormEnd ();
 
    /***** End form *****/
    Frm_EndForm ();