diff --git a/core/auth.js b/core/auth.js
index 28859d4b8..c725e6f33 100644
--- a/core/auth.js
+++ b/core/auth.js
@@ -211,6 +211,10 @@ function handler(request, response) {
 					contents += '<input id="guestButton" type="submit" name="submit" value="Proceeed as Guest">\n';
 					contents += '</div>\n';
 					contents += '</div>\n';
+					contents += '<div style="text-align: center">\n';
+					contents += '<h2>Code of Conduct</h2>\n';
+					contents += `<div><textarea readonly rows=20 cols=80>${core.globalSettings.code_of_conduct}</textarea></div>\n`;
+					contents += '</div>\n';
 					contents += '</form>';
 				}
 				var text = html.replace("<!--SESSION-->", contents);
diff --git a/core/core.js b/core/core.js
index 76d8a316a..8a7e8918d 100644
--- a/core/core.js
+++ b/core/core.js
@@ -17,6 +17,11 @@ const k_global_settings = {
 		default_value: true,
 		description: 'Whether this instance should behave as a room.',
 	},
+	code_of_conduct: {
+		type: 'textarea',
+		default_value: undefined,
+		description: 'Code of conduct presented at sign-in.',
+	},
 };
 
 var gGlobalSettings = {