diff --git a/WebminCore.pm b/WebminCore.pm
index 393184520..d4342142f 100644
--- a/WebminCore.pm
+++ b/WebminCore.pm
@@ -30,7 +30,7 @@ push(@EXPORT, qw(&unique));
 push(@EXPORT, qw($config_directory $var_directory $remote_error_handler %month_to_number_map %number_to_month_map $webmin_feedback_address $default_lang $default_charset $module_index_name $module_index_link %in $in @in $progress_callback_prefix $progress_callback_url $wait_for_debug $wait_for_input @matches $theme_no_table $webmin_logfile $pragma_no_cache));
 
 # Functions defined in themes
-push(@EXPORT, qw(&theme_post_save_domain &theme_post_save_domains &theme_post_save_server &theme_select_server &theme_select_domain &theme_post_save_folder &theme_post_change_modules &theme_address_button &theme_virtualmin_ui_rating_selector &theme_virtualmin_ui_show_cron_time &theme_virtualmin_ui_parse_cron_time &theme_virtualmin_ui_html_editor_bodytags &theme_virtualmin_ui_show_html_editor &theme_post_change_theme &theme_pre_change_theme &theme_fonts &theme_css_inline));
+push(@EXPORT, qw(&theme_post_save_domain &theme_post_save_domains &theme_post_save_server &theme_select_server &theme_select_domain &theme_post_save_folder &theme_post_change_modules &theme_address_button &theme_virtualmin_ui_rating_selector &theme_virtualmin_ui_show_cron_time &theme_virtualmin_ui_parse_cron_time &theme_virtualmin_ui_html_editor_bodytags &theme_virtualmin_ui_show_html_editor &theme_post_change_theme &theme_pre_change_theme &theme_fonts &theme_css_inline &theme_forgot_url));
 
 $called_from_webmin_core = 1;
 do "web-lib.pl";
diff --git a/forgot_send.cgi b/forgot_send.cgi
index 6064604f3..1c621af62 100755
--- a/forgot_send.cgi
+++ b/forgot_send.cgi
@@ -6,6 +6,7 @@ use WebminCore;
 $no_acl_check++;
 &init_config();
 &ReadParse();
+&load_theme_library();
 
 &error_setup($text{'forgot_err'});
 $gconfig{'forgot_pass'} || &error($text{'forgot_ecannot'});
@@ -74,6 +75,7 @@ $link{'id'} || &error($text{'forgot_erandom'});
 &write_file("$main::forgot_password_link_dir/$link{'id'}", \%link);
 my $baseurl = &get_webmin_email_url();
 my $url = $baseurl.'/forgot.cgi?id='.&urlize($link{'id'});
+$url = &theme_forgot_url($baseurl, $link{'id'}) if (defined(&theme_forgot_url));
 
 &ui_print_header(undef, $text{'forgot_title'}, "", undef, undef, 1, 1);