diff --git a/awx/main/models/organization.py b/awx/main/models/organization.py
index e5b441cf70..ce345fef8f 100644
--- a/awx/main/models/organization.py
+++ b/awx/main/models/organization.py
@@ -350,7 +350,7 @@ class Credential(CommonModelNameNotUnique):
             # if hit hasn't been specified, then we're just doing a normal save.
             for field in self.PASSWORD_FIELDS:
                 ask = bool(self.kind == 'ssh' and field != 'ssh_key_data')
-                encrypted = encrypt_field(self, field, ask)
+                encrypted = encrypt_field(self, field, ask.encode('utf-8'))
                 setattr(self, field, encrypted)
                 if field not in update_fields:
                     update_fields.append(field)
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 9715cf92f1..01884fe965 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -184,7 +184,7 @@ class BaseTask(Task):
         status, stdout = 'error', ''
         logfile = task_stdout_handle
         logfile_pos = logfile.tell()
-        child = pexpect.spawn(args[0], args[1:], cwd=cwd, env=env)
+        child = pexpect.spawnu(args[0], args[1:], cwd=cwd, env=env)
         child.logfile_read = logfile
         canceled = False
         last_stdout_update = time.time()