diff --git a/apps/settings/js/admin.js b/apps/settings/js/admin.js
index dfe9b8cabadca..10b2c151d4bcf 100644
--- a/apps/settings/js/admin.js
+++ b/apps/settings/js/admin.js
@@ -79,15 +79,24 @@ $(document).ready(function(){
 				value = 'no';
 			}
 		}
+		if ((this.id === 'shareapiExpireAfterNDays' || this.id === 'shareapiInternalExpireAfterNDays') && value === '') {
+			value = '7'
+		}
 		OCP.AppConfig.setValue('core', $(this).attr('name'), value);
 	});
 
 	$('#shareapiDefaultExpireDate').change(function() {
 		$("#setDefaultExpireDate").toggleClass('hidden', !this.checked);
+		if (this.checked) {
+			$('#shareapiExpireAfterNDays').trigger('change');
+		}
 	});
 
 	$('#shareapiDefaultInternalExpireDate').change(function() {
 		$("#setDefaultInternalExpireDate").toggleClass('hidden', !this.checked);
+		if (this.checked) {
+			$('#shareapiInternalExpireAfterNDays').trigger('change');
+		}
 	});
 
 	$('#publicShareDisclaimer').change(function() {