diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 0c3cad40f..9a2fed009 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -2166,6 +2166,8 @@ sub clearConfiguration {
 		foreach my $target (@{$targets}) {
 			disableTarget($driver, $target);
 		}
+
+		disableDriver($driver);
 	}
 
 	print "\t-> Configuration cleared.\n";
@@ -3869,6 +3871,28 @@ sub disableTarget {
 	setTargetAttributes($driver, $target, \%attributes);
 }
 
+sub enableDriver {
+	my $driver = shift;
+	my %attributes = ('enabled', 1);
+
+	my $attrs = $SCST->driverAttributes($driver);
+use Data::Dumper;
+print Dumper($attrs);
+	return if (!defined($$attrs{'enabled'}));
+
+	setDriverAttributes($driver, \%attributes);
+}
+
+sub disableDriver {
+	my $driver = shift;
+	my %attributes = ('enabled', 0);
+
+	my $attrs = $SCST->driverAttributes($driver);
+	return if (!defined($$attrs{'enabled'}));
+
+	setDriverAttributes($driver, \%attributes);
+}
+
 sub issueLip {
 	my $driver = shift;
 	my $target = shift;