|#434|+Manan| Fixing  bug 434 and one authorization issue.