diff --git a/wp-admin/users.php b/wp-admin/users.php
index 1fcaf1357b..56144e2c89 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -450,7 +450,12 @@ foreach ( (array) $roleclass as $user_object ) {
 
 <div class="narrow">
 
-<?php echo '<p>'.sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-login.php?action=register').'</p>'; ?>
+<?php 
+	if ( get_option('users_can_register') ) 
+		echo '<p>' . sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php') . '</p>'; 
+	else 
+        echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '</p>'; 
+?>
 <form action="#add-new-user" method="post" name="adduser" id="adduser">
 <?php wp_nonce_field('add-user') ?>
 <table class="editform" width="100%" cellspacing="2" cellpadding="5">