diff --git a/.aws/faucet.sh b/.aws/faucet.sh
index d8f0d7e909..3c9f978cc0 100644
--- a/.aws/faucet.sh
+++ b/.aws/faucet.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 AMOUNTS=10000000stake
-AMOUNTP=5photino
-AMOUNTC=1cococoin
+AMOUNTP=5000000photino
+# AMOUNTC=123123cococoin
 
 ACCOUNT=$1
 PASSWORD=$2
@@ -19,14 +19,25 @@ do
             DESTINATION=$(echo $row | awk '{print $4}')
             if [[ ${#DESTINATION} -eq 45 ]];
             then
-                # work only on stuff that have the right length
-                ADDRESS=$(./gaiacli keys show ${ACCOUNT} --home . --address)
-                echo ${PASSWORD} | ./gaiacli tx send ${DESTINATION} ${AMOUNTS} --home . --from ${ADDRESS} --chain-id=${NETWORK}
-                echo ${PASSWORD} | ./gaiacli tx send ${DESTINATION} ${AMOUNTP} --home . --from ${ADDRESS} --chain-id=${NETWORK}
-                echo ${PASSWORD} | ./gaiacli tx send ${DESTINATION} ${AMOUNTC} --home . --from ${ADDRESS} --chain-id=${NETWORK}
+                ACCOUNT_INFO=$(./gaiacli query account ${DESTINATION} --chain-id ${NETWORK} --trust-node --home .)
+                dt=$(date '+%d/%m/%Y %H:%M:%S');
+                if [[ ${ACCOUNT_INFO} == *"stake"* ]]; then
+                    echo "$dt - $DESTINATION already funded, accounts are only funded once"
+                else
+                    # work only on stuff that have the right length
+                    ADDRESS=$(./gaiacli keys show ${ACCOUNT} --home . --address)
+                    echo "stakes $AMOUNTS at $DESTINATION"
+                    echo ${PASSWORD} | ./gaiacli tx send ${DESTINATION} ${AMOUNTS} --home . --from ${ADDRESS} --chain-id=${NETWORK} --yes
+                    sleep 5s # TODO: should be smarter, check if block was created or not
+                    echo "photino $AMOUNTP at $DESTINATION"
+                    echo ${PASSWORD} | ./gaiacli tx send ${DESTINATION} ${AMOUNTP} --home . --from ${ADDRESS} --chain-id=${NETWORK} --yes
+                    # echo ${PASSWORD} | ./gaiacli tx send ${DESTINATION} ${AMOUNTC} --home . --from ${ADDRESS} --chain-id=${NETWORK}
+                    echo "$dt - $DESTINATION funded, enjoy!"
+                fi
             fi
             # Remove this address from the ones that needs money
             aws s3 rm s3://cosmos-gaia/addresses/${DESTINATION}
         done
     fi
+    sleep 10s
 done
diff --git a/.aws/first.sh b/.aws/first.sh
index 7a8445e37e..c7572804e6 100644
--- a/.aws/first.sh
+++ b/.aws/first.sh
@@ -15,7 +15,7 @@ NODEID=$(./gaiad tendermint show-node-id --home .)
 
 # Create our main account and add it to the genesis with a lot of money
 echo ${PASSWORD} | ./gaiacli keys add ${ACCOUNT} --home . > account_address.log
-./gaiad add-genesis-account $(./gaiacli keys show ${ACCOUNT} --home . --address) 100000000000000000stake,999000000000photino,123123123123cococoin --home .
+./gaiad add-genesis-account $(./gaiacli keys show ${ACCOUNT} --home . --address) 1000000000000000000000stake,100000000000000000000photino,123123123123123123cococoin --home .
 
 echo ${PASSWORD} | ./gaiad gentx --name ${ACCOUNT} --home . --home-client .
 ./gaiad collect-gentxs --home .
@@ -26,6 +26,6 @@ aws s3 cp config/genesis.json s3://cosmos-gaia/genesis.json
 # boot proper nodes in reachable detached sessions
 screen -dmS gaia ./gaiad start --home .
 screen -dmS rest ./gaiacli rest-server --laddr tcp://0.0.0.0:${API_PORT} --home . --node http://localhost:${PORT} --chain-id ${NETWORK} --trust-node true
-screen -dmS faucet ./faucet.sh ${ACCOUNT} ${PASSWORD} ${NETWORK}
+screen -dmSL faucet ./faucet.sh ${ACCOUNT} ${PASSWORD} ${NETWORK}
 
 echo ${NODEID}
diff --git a/.aws/others.sh b/.aws/others.sh
index 8b9b93b2ab..8f722f29d2 100644
--- a/.aws/others.sh
+++ b/.aws/others.sh
@@ -4,7 +4,7 @@ PASSWORD=1234567890
 ACCOUNT=operator_account
 PORT=26656
 # TODO: hardcoded temporary, this will become a parameter coming from the first ECS instance
-MAINNODEID=a93accb0af3dfda1f40063bd45857c4808ba2d9b
+MAINNODEID=03bd1fd646a9684eb53d40fd342529b5dd9accbf
 MAINNODEIP=172.31.35.89
 MAINACCOUNT=main_account
 NETWORK=testnet
@@ -24,7 +24,7 @@ aws s3 cp s3://cosmos-gaia/genesis.json config/genesis.json
 NODEID=$(./gaiad tendermint show-node-id --home .)
 
 # boot referring to the remote node
-screen -dmS gaia ./gaiad start --home . --p2p.persistent_peers="$MAINNODEID@$MAINNODEIP:$((PORT))"
+screen -dmSL gaia ./gaiad start --home . --p2p.persistent_peers="$MAINNODEID@$MAINNODEIP:$((PORT))"
 
 # get the key to make my node validator
 PUBKEY=$(./gaiad tendermint show-validator --home .)
@@ -40,11 +40,11 @@ while ${poor}
 do
     # query my account to check if I'm still poor
     ACCOUNT_INFO=$(./gaiacli query account ${ADDRESS} --chain-id ${NETWORK} --trust-node --home .)
-    if [[ ${ACCOUNT_INFO} == *"auth/Account"* ]]; then
+    if [[ ${ACCOUNT_INFO} == *"steak"* ]]; then
         echo "Address funded, thanks main node!"
         poor=false
     fi
     sleep 3s
 done
 
-echo ${PASSWORD} | ./gaiacli tx staking create-validator --home . --from ${ACCOUNT} --amount=${VALIDATOR_AMOUNT} --pubkey=${PUBKEY} --address-delegator=${ADDRESS} --moniker=${ACCOUNT} --chain-id=${NETWORK} --commission-max-change-rate=0 --commission-max-rate=0 --commission-rate=0 --min-self-delegation=1
+echo ${PASSWORD} | ./gaiacli tx staking create-validator --home . --from ${ACCOUNT} --amount=${VALIDATOR_AMOUNT} --pubkey=${PUBKEY} --moniker=${ACCOUNT} --chain-id=${NETWORK} --commission-max-change-rate=0 --commission-max-rate=0 --commission-rate=0 --min-self-delegation=1 --yes
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec15ed1370..62bd957d64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+
 ## [1.0.0-beta.16] - 2019-03-11
 
 ### Added
diff --git a/PENDING.md b/PENDING.md
index b23c168897..cb62c06cf3 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -1,4 +1,5 @@
 ### Changed
 
+- [#\2210](https://github.com/cosmos/voyager/pull/2210) Faucet give money only to non-existent addresses @sabau
 - [#\2202](https://github.com/cosmos/voyager/pull/2202) Fix circle configuration for publishing @sabau
-- [#\2236](https://github.com/cosmos/voyager/pull/2236) ES lint no tabs @sabau
\ No newline at end of file
+- [#\2236](https://github.com/cosmos/voyager/pull/2236) ES lint no tabs @sabau