diff --git a/core/templates/installation.php b/core/templates/installation.php
index c70903cba552ae4f3a3d2c6f3ba37be830161fe1..79510042307c92194baad7cd148f94e900edfcbf 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -63,6 +63,7 @@
 		<div id="datadirContent">
 			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
 			<input type="text" name="directory" id="directory"
+				placeholder="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>"
 				value="<?php p(OC_Helper::init_var('directory', $_['directory'])); ?>" />
 		</div>
 	</fieldset>
diff --git a/lib/setup.php b/lib/setup.php
index 7082f0b2afd4dc19e9596ed3694b1c22a0e10c92..769fae11656c33dc79338aac83d282c56e2c2bf3 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -37,7 +37,7 @@ class OC_Setup {
 			$error[] = $l->t('Set an admin password.');
 		}
 		if(empty($options['directory'])) {
-			$error[] = $l->t('Specify a data folder.');
+			$options['directory'] = OC::$SERVERROOT."/data";
 		}
 
 		if($dbtype == 'mysql' or $dbtype == 'pgsql' or $dbtype == 'oci' or $dbtype == 'mssql') { //mysql and postgresql needs more config options