diff --git a/manifests/config.pp b/manifests/config.pp
index 587e274..6ee4bee 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -3,12 +3,15 @@
   String  $datadir          = $geth::datadir,
   String  $account_password = $geth::account_password,
   String  $passfile         = $geth::passfile,
+  String  $logdir           = $geth::logdir,
 )
 inherits geth {
   exec { 'geth-init-data':
     cwd     => '/home/geth',
-    command => "geth data init --datadir ${datadir}",
+    command => "geth data init --datadir ${datadir} 2>> ${logdir}/init-data.log",
     user    => 'geth',
+    # Command is so long ?!?
+    timeout => 1800,
     path    => [ '/usr/bin', '/bin', '/usr/sbin' ],
 }
 ~> file { 'passfile':
@@ -19,7 +22,7 @@
 }
 ~> exec { 'geth-create-account':
     cwd     => '/home/geth',
-    command => "geth account new --password ${passfile}",
+    command => "geth account new --password ${passfile} 2>> ${logdir}/create-account.log",
     user    => 'geth',
     path    => [ '/usr/bin', '/bin', '/usr/sbin' ],
   }