diff --git a/web/static/js/auth.js b/web/static/js/auth.js
index f96621e..fbfc87b 100644
--- a/web/static/js/auth.js
+++ b/web/static/js/auth.js
@@ -365,8 +365,12 @@ async function selectDocusignAccount(accountId, errorEl = null) {
     await api.auth.selectDocusignAccount(accountId);
     closeDocusignAccountPicker();
     await refreshAuth();
-    const { refreshTemplates } = await import('./templates.js');
-    refreshTemplates();
+    setState('templatesError', null);
+    const { refreshTemplates, renderTemplates } = await import('./templates.js');
+    await refreshTemplates();
+    if ((window.location.hash || '#/templates').startsWith('#/templates')) {
+      await renderTemplates();
+    }
     showToast('DocuSign account selected.', 'success');
   } catch (e) {
     if (errorEl) {