LOGIN and LOGIN_ macros no longer needed