diff --git a/data/model.py b/data/model.py
index dc478b682..c44568dc2 100644
--- a/data/model.py
+++ b/data/model.py
@@ -111,7 +111,10 @@ def create_organization(name, email, creating_user):
 
     return new_org
   except InvalidUsernameException:
-    raise InvalidOrganizationException('Invalid organization name: %s' % name)
+    msg = ('Invalid organization name: %s Organization names must consist ' +
+           'solely of lower case letters, numbers, and underscores. ' + 
+           '[a-z0-9_]') % name
+    raise InvalidOrganizationException(msg)
 
 
 def create_robot(robot_shortname, parent):
diff --git a/static/partials/new-organization.html b/static/partials/new-organization.html
index 79d29e3f9..05abfe185 100644
--- a/static/partials/new-organization.html
+++ b/static/partials/new-organization.html
@@ -54,7 +54,7 @@
             <label for="orgName">Organization Name</label>
             <input id="orgName" name="orgName" type="text" class="form-control" placeholder="Organization Name"
                    ng-model="org.name" required autofocus data-trigger="manual" data-content="{{ createError }}"
-                   data-placement="right">
+                   data-placement="right" data-container="body">
             <span class="description">This will also be the namespace for your repositories</span>
           </div>