password pattern help , shortcode improvement/fix