Unpick DEFRA users

The user we had as "defra" was in fact for a part of DEFRA, rather than DEFRA
proper. This change adds a user for DEFRA proper and attaches the existing key
to a new user.