diff --git a/public/legacy/modules/Users/tpls/EditViewFooter.tpl b/public/legacy/modules/Users/tpls/EditViewFooter.tpl
index ac9602357..9fd87812f 100755
--- a/public/legacy/modules/Users/tpls/EditViewFooter.tpl
+++ b/public/legacy/modules/Users/tpls/EditViewFooter.tpl
@@ -246,72 +246,66 @@
-
-
-
-
-
{$MOD.LBL_EXPORT_CHARSET}: {sugar_help text=$MOD.LBL_EXPORT_CHARSET_DESC }
-
-
+
+
+
{$MOD.LBL_EXPORT_CHARSET}: {sugar_help text=$MOD.LBL_EXPORT_CHARSET_DESC }
+
+
+
+
+
{$MOD.LBL_REMINDER}: {sugar_help text=$MOD.LBL_REMINDER_TEXT }
+
{include file="modules/Reminders/tpls/remindersDefaults.tpl"}
+
+
-
-
{$MOD.LBL_REMINDER}: {sugar_help text=$MOD.LBL_REMINDER_TEXT }
-
{include file="modules/Reminders/tpls/remindersDefaults.tpl"}
-
-
+
+
+
{$MOD.LBL_DESKTOP_NOTIFICATIONS}:
+
+
+
+
+
+
+
+
+
{$MOD.LBL_SNOOZE_TIMER}:
+
+
+
-
-
-
-
{$MOD.LBL_DESKTOP_NOTIFICATIONS}:
-
-
-
+
+
+
{$MOD.LBL_USE_REAL_NAMES}: {sugar_help text=$MOD.LBL_USE_REAL_NAMES_DESC }
+
+
+
+
+
{$MOD.LBL_MAILMERGE}: {sugar_help text=$MOD.LBL_MAILMERGE_TEXT }
+
+
+
+
-
-
-
{$MOD.LBL_SNOOZE_TIMER}:
-
-
-
-
-
-
-
-
-
{$MOD.LBL_USE_REAL_NAMES}: {sugar_help text=$MOD.LBL_USE_REAL_NAMES_DESC }
-
-
-
-
-
{$MOD.LBL_MAILMERGE}: {sugar_help text=$MOD.LBL_MAILMERGE_TEXT }
-
-
-
-
-
-
-
-
-
-
{capture name=SMARTY_LBL_EXTERNAL_AUTH_ONLY} {$MOD.LBL_EXTERNAL_AUTH_ONLY} {$EXTERNAL_AUTH_CLASS_1}{/capture}
-
-
{$EXTERNAL_AUTH_CLASS} {$MOD.LBL_ONLY}:
- {sugar_help text=$smarty.capture.SMARTY_LBL_EXTERNAL_AUTH_ONLY}
-
+
+
{capture name=SMARTY_LBL_EXTERNAL_AUTH_ONLY} {$MOD.LBL_EXTERNAL_AUTH_ONLY} {$EXTERNAL_AUTH_CLASS_1}{/capture}
+
+
{$EXTERNAL_AUTH_CLASS} {$MOD.LBL_ONLY}:
+ {sugar_help text=$smarty.capture.SMARTY_LBL_EXTERNAL_AUTH_ONLY}
+
-
+
+
-
-
+
-
@@ -401,167 +395,165 @@
+ {/if}
+
-
+
+
+ {$MOD.LBL_NUMBER_GROUPING_SEP}:
+ {sugar_help text=$MOD.LBL_NUMBER_GROUPING_SEP_TEXT }
+
+
+
+
+
+
+
- {/if}
-
-
-
-
- {$MOD.LBL_NUMBER_GROUPING_SEP}:
- {sugar_help text=$MOD.LBL_NUMBER_GROUPING_SEP_TEXT }
-
-
-
-
+ {capture name=SMARTY_LOCALE_NAME_FORMAT_DESC} {$MOD.LBL_LOCALE_NAME_FORMAT_DESC}{/capture}
+
+
+
{$MOD.LBL_LOCALE_DEFAULT_NAME_FORMAT}
+ : {sugar_help text=$smarty.capture.SMARTY_LOCALE_NAME_FORMAT_DESC }
+
+
+
+
+
+
+
+ {$MOD.LBL_DECIMAL_SEP}: {sugar_help text=$MOD.LBL_DECIMAL_SEP_TEXT }
+
+
+
+
+
+
+
+
-
-
-
- {capture name=SMARTY_LOCALE_NAME_FORMAT_DESC} {$MOD.LBL_LOCALE_NAME_FORMAT_DESC}{/capture}
-
-
-
{$MOD.LBL_LOCALE_DEFAULT_NAME_FORMAT}
- : {sugar_help text=$smarty.capture.SMARTY_LOCALE_NAME_FORMAT_DESC }
-
-
-
-
-
-
-
- {$MOD.LBL_DECIMAL_SEP}: {sugar_help text=$MOD.LBL_DECIMAL_SEP_TEXT }
-
-
-
-
-
-
-
-
-
-
-
-
- {$MOD.LBL_USER_LANGUAGE}:
-
+
+
+
+ {$MOD.LBL_USER_LANGUAGE}:
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
- {$MOD.LBL_CALENDAR_OPTIONS}
-
-
-
-
-
-
- {$MOD.LBL_PUBLISH_KEY}: {sugar_help text=$MOD.LBL_CHOOSE_A_KEY}
-
-
+
+
+ {$MOD.LBL_CALENDAR_OPTIONS}
+
+
+
+
+
+
+ {$MOD.LBL_PUBLISH_KEY}: {sugar_help text=$MOD.LBL_CHOOSE_A_KEY}
+
+
+
+
-
-
-
-
-
-
- {$MOD.LBL_YOUR_PUBLISH_URL|strip_semicolon}:
-
+
+
+
+
+ {$MOD.LBL_YOUR_PUBLISH_URL|strip_semicolon}:
+
+
+
+ {$CALENDAR_PUBLISH_URL}
+ {$MOD.LBL_NO_KEY}
+
+
-
- {$CALENDAR_PUBLISH_URL}
- {$MOD.LBL_NO_KEY}
-
-
-
-
-
-
-
{$MOD.LBL_SEARCH_URL|strip_semicolon}:
+
+
+
+ {$MOD.LBL_SEARCH_URL|strip_semicolon}:
+
+
+ {$CALENDAR_SEARCH_URL}
+ {$MOD.LBL_NO_KEY}
+
+
-
- {$CALENDAR_SEARCH_URL}
- {$MOD.LBL_NO_KEY}
-
-
-
-
-
-
-
{$MOD.LBL_ICAL_PUB_URL|strip_semicolon}: {sugar_help text=$MOD.LBL_ICAL_PUB_URL_HELP}
+
+
+
+ {$MOD.LBL_ICAL_PUB_URL|strip_semicolon}: {sugar_help text=$MOD.LBL_ICAL_PUB_URL_HELP}
+
+
+ {$CALENDAR_ICAL_URL}
+ {$MOD.LBL_NO_KEY}
+
+
-
- {$CALENDAR_ICAL_URL}
- {$MOD.LBL_NO_KEY}
-
-
-
-
-
-
- {$MOD.LBL_FDOW}: {sugar_help text=$MOD.LBL_FDOW_TEXT}
-
-
-
-
-
-
+
{if $ID}
@@ -681,6 +673,7 @@
+