diff --git a/ucs-school-umc-users/umc/js/schoolusers.js b/ucs-school-umc-users/umc/js/schoolusers.js
index bb93fdafea..be5758f441 100644
--- a/ucs-school-umc-users/umc/js/schoolusers.js
+++ b/ucs-school-umc-users/umc/js/schoolusers.js
@@ -179,8 +179,8 @@ define([
 					on(_school, 'change', lang.hitch(this, function() {
 						var classBeforeChange = _class.get('value');
 						on.once(_class, 'valuesLoaded', lang.hitch(this, function() {
-							_class.set('value', 'None');
-							_class._saveInitialValue();
+							// _class.set('value', 'None'); // Not necessary anymore due to Bug #47141
+							// _class._saveInitialValue();
 							if (classBeforeChange === 'None' && tools.isTrue(ucr['ucsschool/passwordreset/autosearch_on_change'] || true)) {
 								this._searchForm.submit();
 							}