diff --git a/FHEM/46_TeslaPowerwall2AC.pm b/FHEM/46_TeslaPowerwall2AC.pm
index 2bc96e5..28bfb69 100644
--- a/FHEM/46_TeslaPowerwall2AC.pm
+++ b/FHEM/46_TeslaPowerwall2AC.pm
@@ -199,7 +199,7 @@ sub Initialize {
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v1.2.1",
+  "version": "v2.0.0",
   "author": [
     "Marko Oldenburg <leongaultier@gmail.com>"
   ],
diff --git a/controls_TeslaPowerwall2AC.txt b/controls_TeslaPowerwall2AC.txt
index ea70c6c..9936ea2 100644
--- a/controls_TeslaPowerwall2AC.txt
+++ b/controls_TeslaPowerwall2AC.txt
@@ -1,2 +1 @@
-UPD 2021-04-20_21:40:31 6866 FHEM/46_TeslaPowerwall2AC.pm
-UPD 2021-04-20_22:39:25 30202 lib/FHEM/Tesla/Powerwall.pm
+UPD 2021-04-21_10:01:00 6866 FHEM/46_TeslaPowerwall2AC.pm
diff --git a/lib/FHEM/Tesla/Powerwall.pm b/lib/FHEM/Tesla/Powerwall.pm
index 9decf91..0499033 100644
--- a/lib/FHEM/Tesla/Powerwall.pm
+++ b/lib/FHEM/Tesla/Powerwall.pm
@@ -365,7 +365,8 @@ sub Get {
         $list .=
 'statusSOE:noArg aggregates:noArg siteinfo:noArg sitemaster:noArg powerwalls:noArg registration:noArg status:noArg'
   if(  ::AttrVal($name,'emailaddr','none') ne 'none'
-    && defined(ReadPassword($hash, $name))
+    && exists($hash->{helper}->{passObj})
+    && defined($hash->{helper}->{passObj}->getReadPassword($name))
     && defined($hash->{TOKEN}) );
 
         return 'Unknown argument ' . $cmd . ', choose one of ' . $list;
@@ -406,11 +407,9 @@ sub Set {
           if ( !defined($passResp)
            and defined($passErr) );
 
-        return q{password successfully saved}
+        return Timer_GetData($hash)
           if ( defined($passResp)
            and !defined($passErr) );
-
-        return Timer_GetData($hash);
     }
     elsif ( lc $cmd eq 'removepassword' ) {
         return "usage: $cmd" if ( scalar( @{$aArg} ) != 0 );
@@ -429,14 +428,12 @@ sub Set {
     else {
 
         my $list = ( exists($hash->{helper}->{passObj})
-            && exists($hash->{helper}->{passObj})
             && defined($hash->{helper}->{passObj}->getReadPassword($name))
           ? 'removePassword:noArg '
           : 'setPassword ');
 
         $list .= 'powerwalls:run,stop'
           if ( ::AttrVal( $name, 'devel', 0 ) == 1
-            && exists($hash->{helper}->{passObj})
             && exists($hash->{helper}->{passObj})
             && defined($hash->{helper}->{passObj}->getReadPassword($name))
             && defined($hash->{TOKEN}) );