diff --git a/src/mod_scram_upgrade.erl b/src/mod_scram_upgrade.erl
index 7699006de..4bf335248 100644
--- a/src/mod_scram_upgrade.erl
+++ b/src/mod_scram_upgrade.erl
@@ -108,8 +108,10 @@ c2s_handle_sasl2_task_data({_, #{user := User, server := Server,
 	    StoredKey = scram:stored_key(Algo, scram:client_key(Algo, SaltedPassword)),
 	    ServerKey = scram:server_key(Algo, SaltedPassword),
 	    ejabberd_auth:set_password_instance(User, Server,
-				       #scram{hash = Algo, iterationcount = Iter, salt = Salt,
-					      serverkey = ServerKey, storedkey = StoredKey}),
+						#scram{hash = Algo, iterationcount = Iter,
+						       salt = base64:encode(Salt),
+						       serverkey = base64:encode(ServerKey),
+						       storedkey = base64:encode(StoredKey)}),
 	    State2 = maps:remove(scram_upgrade, State),
 	    InlineEls2 = lists:keydelete(sasl_upgrade, 1, InlineEls),
 	    {State3, NewEls, Results} = ejabberd_c2s:handle_sasl2_inline(InlineEls2, State2),