diff --git a/setup/ldap.php b/setup/ldap.php
index 46b523b10c..fd8da01640 100644
--- a/setup/ldap.php
+++ b/setup/ldap.php
@@ -61,9 +61,11 @@
 	$setup_tpl->set_var('lang_ldapmodify',lang('Modify an existing LDAP account store for use with phpGroupWare (for a new install using LDAP accounts)'));
 	$setup_tpl->set_var('lang_ldapimport',lang('Import accounts from LDAP to the phpGroupware accounts table (for a new install using SQL accounts)'));
 	$setup_tpl->set_var('lang_ldapexport',lang('Export phpGroupware accounts from SQL to LDAP'));
+	$setup_tpl->set_var('lang_ldapdummy',lang('Setup demo accounts in LDAP'));
 	$setup_tpl->set_var('ldapmodify','ldapmodify.php');
 	$setup_tpl->set_var('ldapimport','ldapimport.php');
 	$setup_tpl->set_var('ldapexport','ldapexport.php');
+	$setup_tpl->set_var('ldapdummy','setup_demo.php');
 	$setup_tpl->set_var('action_url','index.php');
 	$setup_tpl->set_var('cancel',lang('Cancel'));
 
diff --git a/setup/setup_demo.php b/setup/setup_demo.php
index 737c5d6b9d..ecee8cd7d1 100644
--- a/setup/setup_demo.php
+++ b/setup/setup_demo.php
@@ -24,7 +24,7 @@
 
 	// Authorize the user to use setup app and load the database
 	// Does not return unless user is authorized
-	if (!$phpgw_setup->auth('Config'))
+	if (!$phpgw_setup->auth('Config') || $HTTP_POST_VARS['cancel'])
 	{
 		Header('Location: index.php');
 		exit;
@@ -76,6 +76,7 @@
 		$setup_tpl->set_var('create_demo_accounts',lang('Create demo accounts'));
 
 		$setup_tpl->set_var('lang_submit',lang('submit'));
+		$setup_tpl->set_var('lang_cancel',lang('cancel'));
 		$setup_tpl->pparse('out','T_setup_demo');
 		$phpgw_setup->show_footer();
 	}
diff --git a/setup/templates/default/ldap.tpl b/setup/templates/default/ldap.tpl
index 3fccadb1ce..e278774ca4 100644
--- a/setup/templates/default/ldap.tpl
+++ b/setup/templates/default/ldap.tpl
@@ -23,6 +23,9 @@
    <tr bgcolor="#e6e6e6">
     <td colspan="2"><a href="{ldapexport}">{lang_ldapexport}</a></td>
    </tr>
+   <tr bgcolor="#e6e6e6">
+    <td colspan="2"><a href="{ldapdummy}">{lang_ldapdummy}</a></td>
+   </tr>
 <!-- END jump -->
 
 <!-- BEGIN user_list -->
diff --git a/setup/templates/default/setup_demo.tpl b/setup/templates/default/setup_demo.tpl
index ec7ea85e96..9dcaecaf3a 100644
--- a/setup/templates/default/setup_demo.tpl
+++ b/setup/templates/default/setup_demo.tpl
@@ -36,7 +36,8 @@
             <td><input type="checkbox" name="create_demo" checked></td>
           </tr>
           <tr>
-            <td colspan="2"><input type="submit" name="submit" value="{lang_submit}"> </td>
+            <td><input type="submit" name="submit" value="{lang_submit}"> </td>
+            <td><input type="submit" name="cancel" value="{lang_cancel}"> </td>
           </tr>
         </table>
       </form>