Fix for issue with '-' chars in pw names