diff --git a/login.html b/login.html
index 78401ef32cda701272d07d2a151bdd8dbeb5e7fd..b8c408a4be4e6608d1e55472f7c4036b41c44c2f 100644
--- a/login.html
+++ b/login.html
@@ -11,9 +11,9 @@ https://github.com/pangeo-data/pangeo-custom-jupyterhub-templates/blob/master/te
       {{ (csusb_welcome | safe) }}
       {% else %}
       Welcome to this Cal State San Bernardino JupyterHub. For more information about HPC,
-      visit <a href="https://www.csusb.edu/academic-technologies-innovation/xreal-lab-and-high-performance-computing/high-performance-0">CSUSB High Performance Computing Initiative</a>.
+      visit <a href="https://www.csusb.edu/academic-technologies-innovation/xreal-lab-and-high-performance-computing/high-performance" target="_blank">CSUSB High Performance Computing Initiative</a>.
       {% endif %}
     </p>
 </div>
 {{ super() }}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/spawn_pending.html b/spawn_pending.html
index f271470a4da8ea7255f0da75ffc172d61e681f2a..2d24b38b9afd1ce3d4e39bbb1133e05d965577bc 100644
--- a/spawn_pending.html
+++ b/spawn_pending.html
@@ -2,5 +2,9 @@
 
 {% block message %}
 {{ super() }}
-This step may take several minutes. If you encouter errors several times, please contact one of the CSUSB HPCI team members. 
+This step may take several minutes. <br> 
+Most of the time, the issue is related to the server (upgrading or temporary maintanance). <br>
+If you encouter the error several times, please contact one of the <a href="https://www.csusb.edu/academic-technologies-innovation/xreal-lab-and-high-performance-computing/high-performance#team" target="_blank">CSUSB HPCI team members</a>. 
+<br>
+<br>
 {% endblock %}