diff --git a/ui/src/admin/components/chronograf/CreateUserOverlay.js b/ui/src/admin/components/chronograf/CreateUserOverlay.js
index f0bd52fd7..a7d808097 100644
--- a/ui/src/admin/components/chronograf/CreateUserOverlay.js
+++ b/ui/src/admin/components/chronograf/CreateUserOverlay.js
@@ -16,7 +16,7 @@ class CreateUserOverlay extends Component {
userScheme: 'oauth2',
userRole: null,
userSuperAdmin: SUPERADMIN_OPTION_ITEMS[1],
- userOrganization: null,
+ userOrganization: this.props.currentOrganization,
}
}
@@ -121,7 +121,7 @@ class CreateUserOverlay extends Component {
replaceWith={
@@ -174,6 +174,10 @@ class CreateUserOverlay extends Component {
const {arrayOf, func, shape, string} = PropTypes
CreateUserOverlay.propTypes = {
+ currentOrganization: shape({
+ id: string.isRequired,
+ name: string.isRequired,
+ }),
onDismiss: func.isRequired,
onCreateUser: func.isRequired,
userRoles: arrayOf(shape()).isRequired,
diff --git a/ui/src/admin/containers/AdminChronografPage.js b/ui/src/admin/containers/AdminChronografPage.js
index 325606005..b75321b34 100644
--- a/ui/src/admin/containers/AdminChronografPage.js
+++ b/ui/src/admin/containers/AdminChronografPage.js
@@ -303,6 +303,7 @@ class AdminChronografPage extends Component {
: null}
{showCreateUserOverlay
?