Fix for issue with missing user and existing template to value