Not a big fan of hardcoded user names. Could we find a another solution for this?