diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
index c748e9b2f..add52770d 100644
--- a/src/ejabberd_piefxis.erl
+++ b/src/ejabberd_piefxis.erl
@@ -166,6 +166,7 @@ export_user(User, Server, Fd) ->
     LServer = jid:nameprep(Server),
     {PassPlain, PassScram} = case ejabberd_auth:password_format(LServer) of
 	       scram -> {[], [format_scram_password(Password)]};
+	       _ when Password == <<"">> -> {[], []};
 	       _ -> {[{<<"password">>, Password}], []}
 	   end,
     Els =