diff --git a/webmin/postinstall.pl b/webmin/postinstall.pl
index 6469cfe83..a3cc56dac 100755
--- a/webmin/postinstall.pl
+++ b/webmin/postinstall.pl
@@ -27,14 +27,23 @@ if (!defined($miniserv{'cipher_list_def'})) {
 		    $clist eq $pfs_ssl_ciphers ? 3 :
 		    0;
 	$miniserv{'cipher_list_def'} = $cmode;
-	&put_miniserv_config(\%miniserv);
 	}
 elsif ($miniserv{'cipher_list_def'} == 2 || $miniserv{'cipher_list_def'} == 3) {
 	# Sync ciphers with Webmin's preferred list
 	$miniserv{'ssl_cipher_list'} = $miniserv{'cipher_list_def'} == 2 ?
 		$strong_ssl_ciphers : $pfs_ssl_ciphers;
-	&put_miniserv_config(\%miniserv);
 	}
+
+# If this is the first install, enable recording of logins by default
+if (!-r $first_install_file) {
+	&foreign_require("cron");
+	&cron::create_wrapper($record_login_cmd, "", "record-login.pl");
+	&cron::create_wrapper($record_logout_cmd, "", "record-logout.pl");
+	$miniserv{'login_script'} = $record_login_cmd;
+	$miniserv{'logout_script'} = $record_logout_cmd;
+	}
+
+&put_miniserv_config(\%miniserv);
 &unlock_file("$config_directory/miniserv.conf");
 
 # Record the version of Webmin at first install