Fix PSK for non-ascii also here, ticket #3917