diff --git a/Utils/distroutils.py b/Utils/distroutils.py
index eb46e19e6..e639e7a9c 100644
--- a/Utils/distroutils.py
+++ b/Utils/distroutils.py
@@ -295,8 +295,8 @@ def __init__(self, config):
 
 
     # noinspection PyMethodOverriding
-    def chpasswd(self, user, password):
-        return ext_utils.run_send_stdin(['pw', 'usermod', 'user', '-h', '0'], password, log_cmd=False)
+    def change_password(self, user, password):
+        return ext_utils.run_send_stdin(['pw', 'usermod', user, '-h', '0'], password.encode('utf-8'), log_cmd=False)
 
     def create_account(self, user, password, expiration, thumbprint, enable_nopasswd):
         """
@@ -315,7 +315,7 @@ def create_account(self, user, password, expiration, thumbprint, enable_nopasswd
                 uidmin = int(ext_utils.get_line_starting_with("UID_MIN", "/etc/login.defs").split()[1])
         except (ValueError, KeyError, AttributeError, EnvironmentError):
             pass
-            pass
+
         if uidmin is None:
             uidmin = 100
         if userentry is not None and userentry[2] < uidmin:
diff --git a/VMAccess/manifest.xml b/VMAccess/manifest.xml
index cbb0d3a00..e186754f7 100644
--- a/VMAccess/manifest.xml
+++ b/VMAccess/manifest.xml
@@ -2,7 +2,7 @@
 <ExtensionImage xmlns="http://schemas.microsoft.com/windowsazure">
   <ProviderNameSpace>Microsoft.OSTCExtensions</ProviderNameSpace>
   <Type>VMAccessForLinux</Type>
-  <Version>1.5.20</Version>
+  <Version>1.5.21</Version>
   <Label>Microsoft Azure VM Access Extension for Linux Virtual Machines</Label>
   <HostingResources>VmRole</HostingResources>
   <MediaLink></MediaLink>