Correctly add username and viewer PK.