diff --git a/fhem/CHANGED b/fhem/CHANGED
index f373794cd..487b2e6c4 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+ - bugfix:  74_GardenaSmartDevice: fix password setter
  - change:  70_BOTVAC: Optimze error message handling
                        Renew accessToken if necessary
                        PBP issues
diff --git a/fhem/FHEM/73_GardenaSmartBridge.pm b/fhem/FHEM/73_GardenaSmartBridge.pm
index 4ac306463..6e387cef4 100644
--- a/fhem/FHEM/73_GardenaSmartBridge.pm
+++ b/fhem/FHEM/73_GardenaSmartBridge.pm
@@ -419,12 +419,12 @@ sub Set {
     elsif ( lc $cmd eq 'gardenaaccountpassword' ) {
         return "please set Attribut gardenaAccountEmail first"
           if ( AttrVal( $name, 'gardenaAccountEmail', 'none' ) eq 'none' );
-        return "usage: $cmd <password>" if ( scalar( @{$a} ) != 0 );
+        return "usage: $cmd <password>" if ( scalar( @{$a} ) != 1 );
 
         StorePassword( $hash, $name, $a->[0] );
     }
     elsif ( lc $cmd eq 'deleteaccountpassword' ) {
-        return "usage: $cmd <password>" if ( scalar( @{$a} ) != 0 );
+        return "usage: $cmd" if ( scalar( @{$a} ) != 0 );
 
         DeletePassword($hash);
     }
@@ -1375,7 +1375,7 @@ sub DeletePassword {
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v2.0.0",
+  "version": "v2.0.1",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"
   ],
diff --git a/fhem/FHEM/74_GardenaSmartDevice.pm b/fhem/FHEM/74_GardenaSmartDevice.pm
index 13c08247e..a95bcfe1d 100644
--- a/fhem/FHEM/74_GardenaSmartDevice.pm
+++ b/fhem/FHEM/74_GardenaSmartDevice.pm
@@ -610,12 +610,8 @@ sub WriteReadings {
     readingsBulkUpdate(
         $hash, 'state',
         (
-            (
-                ReadingsVal( $name, 'watering-watering_timer_1_state', 'open' )
-                  eq 'open'
-                  || ReadingsVal( $name, 'watering-watering_timer_1_state',
-                    'offen' ) eq 'offen'
-            )
+                ReadingsVal( $name, 'watering-watering_timer_1_duration', 0 )
+                  =~ m{\A[1-9]([0-9]+)?\z}xms
             ? RigReadingsValue( $hash, 'open' )
             : RigReadingsValue( $hash, 'closed' )
         )
@@ -1216,7 +1212,7 @@ sub SetPredefinedStartPoints {
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v2.0.1",
+  "version": "v2.0.2",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"
   ],