diff --git a/src/main/kotlin/essentials/Event.kt b/src/main/kotlin/essentials/Event.kt
index e93ef8b5..85fa14ec 100644
--- a/src/main/kotlin/essentials/Event.kt
+++ b/src/main/kotlin/essentials/Event.kt
@@ -1938,7 +1938,7 @@ object Event {
 
             val score = if (winner == p.team()) {
                 if (state.rules.attackMode) {
-                    time + (target.currentBuildAttackCount + erekirAttack) - (target.currentBuildDeconstructedCount + target.currentBuildDestroyedCount)
+                    time + (target.currentBuildAttackCount + erekirAttack)
                 } else if (state.rules.pvp) {
                     time + erekirPvP + 5000
                 } else {
diff --git a/src/main/kotlin/essentials/Trigger.kt b/src/main/kotlin/essentials/Trigger.kt
index 78565004..31544296 100644
--- a/src/main/kotlin/essentials/Trigger.kt
+++ b/src/main/kotlin/essentials/Trigger.kt
@@ -26,6 +26,7 @@ import java.net.*
 import java.nio.ByteBuffer
 import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.ZoneOffset
 import java.util.*
 import java.util.concurrent.TimeUnit
 import java.util.function.Consumer
@@ -44,14 +45,14 @@ object Trigger {
             }
 
             if (data.lastLoginDate != null) {
-                if ((LocalDate.now().toEpochDay() - data.lastLoginDate!!.toEpochDay()) == 1L) {
+                if ((LocalDate.now(ZoneOffset.UTC).toEpochDay() - data.lastLoginDate!!.toEpochDay()) == 1L) {
                     data.joinStacks++
                     when {
-                        data.joinStacks % 3 == 0 -> data.expMultiplier = 1.2
-                        data.joinStacks % 7 == 0 -> data.expMultiplier = 1.5
-                        data.joinStacks % 30 == 0 -> data.expMultiplier = 2.5
+                        data.joinStacks <= 3 -> data.expMultiplier = 1.5
+                        data.joinStacks <= 7 -> data.expMultiplier = 2.5
+                        data.joinStacks <= 15 -> data.expMultiplier = 5.0
                     }
-                } else {
+                } else if ((LocalDate.now(ZoneOffset.UTC).toEpochDay() - data.lastLoginDate!!.toEpochDay()) >= 2L) {
                     data.joinStacks = 0
                 }
             }