fix infinite loop
Add User credentials action
Sort properties
add support for credentials based parameters