diff --git a/src/lolautoaccept.cpp b/src/lolautoaccept.cpp
index 921464b..f889eb5 100644
--- a/src/lolautoaccept.cpp
+++ b/src/lolautoaccept.cpp
@@ -340,7 +340,7 @@ void LolAutoAccept::phase(const ownactions_t& ownactions, ClientAPI::ChampSelect
 				}
 			}
 
-			if(it.championID != (int32_t) champid || !it.completed) {
+			if((it.championID != (int32_t) champid || !it.completed) && champid != 0) {
 				// try to prepick a champion
 				Log::info << "try to pick champ: " << champid;
 
@@ -415,7 +415,7 @@ void LolAutoAccept::champSelect() {
 	}
 
 	// reload config based on position if changed
-	if(pos != currentPosition) {
+	if(pos != currentPosition || !currentPositionSet) {
 		Log::note << "LolAutoAccept reloading config for position: " << pos << " because it was: " << currentPosition;
 		loadPosition(pos);
 		if(onPoschange) {