Agdroid 271

Moving logic from -pipe to -auth