diff --git a/src/opnsense/service/templates/OPNsense/Auth/motd.in b/src/opnsense/service/templates/OPNsense/Auth/motd.in
index fea56070c..0e7bee705 100644
--- a/src/opnsense/service/templates/OPNsense/Auth/motd.in
+++ b/src/opnsense/service/templates/OPNsense/Auth/motd.in
@@ -1,4 +1,9 @@
-
-Hello, this is OPNsense %%CORE_ABI%%.
-
-Visit us at:	https://opnsense.org/
+ --------------------------------------------
+| Hello, this is OPNsense %%CORE_ABI%%!         |
+|                                            |
+| Website:	https://opnsense.org/        |
+| Handbook:	https://docs.opnsense.org/   |
+| Forums:	https://forums.opnsense.org/ |
+| Lists:	https://lists.opnsense.org/  |
+| Code:		https://github.com/opnsense  |
+ --------------------------------------------