Removed rendudant isset check as it was causing the != 'user' portion of the if expression to be skipped.  #1900