I think the simplest thing is for the server to generate a salt for every user and add a step for the client to request the salt for a given user. If you want

I think the simplest thing is for the server to generate a salt for every user and add a step for the client to request the salt for a given user. If you want to protect against account enumeration then you need to be able to generate consistent salts for accounts that don't exist also.