diff --git a/modules/extra/send_raw.cpp b/modules/extra/send_raw.cpp
index 6c3af533..342f1a84 100644
--- a/modules/extra/send_raw.cpp
+++ b/modules/extra/send_raw.cpp
@@ -52,6 +52,12 @@ public:
 				WebSock.GetSession()->AddSuccess("Line sent");
 			}
 
+			const map<CString,CUser*>& msUsers = CZNC::Get().GetUserMap();
+			for (map<CString,CUser*>::const_iterator it = msUsers.begin(); it != msUsers.end(); ++it) {
+				CTemplate& l = Tmpl.AddRow("UserLoop");
+				l["Username"] = (*it->second).GetUserName();
+			}
+
 			return true;
 		}
 
diff --git a/modules/extra/send_raw/tmpl/index.tmpl b/modules/extra/send_raw/tmpl/index.tmpl
index c8ee0a8f..a5b833e0 100644
--- a/modules/extra/send_raw/tmpl/index.tmpl
+++ b/modules/extra/send_raw/tmpl/index.tmpl
@@ -10,7 +10,11 @@
 			<div class="sectionbody">
 				<div class="subsection third">
 					<div class="inputlabel">User:</div>
-					<div><input type="text" name="user" value="<? VAR user ?>" /></div>
+					<div><select name="user">
+						<? LOOP UserLoop?>
+							<option value="<? VAR Username ESC=HTML ?>"><? VAR Username ESC=HTML ?></option>
+						<? ENDLOOP ?>
+					</select></div>
 				</div>
 
 				<div class="subsection third">