diff --git a/server/combat.js b/server/combat.js
index 50c0af6..2e53bc9 100644
--- a/server/combat.js
+++ b/server/combat.js
@@ -86,8 +86,8 @@ const attackStatusRequest = (connection) => (req, res) => {
 }
 
 const combatLogRequest = (connection) => (req, res) => {
-	let query = 'SELECT pastCombat.*, atk.username AS attackerUsername, def.username AS defenderUsername FROM pastCombat JOIN accounts AS atk ON pastCombat.attackerId = atk.id JOIN accounts AS def ON pastCombat.defenderId = def.id WHERE def.username = ? ORDER BY eventTime DESC LIMIT ?, ?;';
-	connection.query(query, [req.body.username, req.body.start, req.body.length], (err, results) => {
+	let query = 'SELECT pastCombat.*, atk.username AS attackerUsername, def.username AS defenderUsername FROM pastCombat JOIN accounts AS atk ON pastCombat.attackerId = atk.id JOIN accounts AS def ON pastCombat.defenderId = def.id WHERE atk.username = ? OR def.username = ? ORDER BY eventTime DESC LIMIT ?, ?;';
+	connection.query(query, [req.body.username, req.body.username, req.body.start, req.body.length], (err, results) => {
 		if (err) throw err;
 
 		res.status(200).json(results);
@@ -128,7 +128,7 @@ const runCombatTick = (connection) => {
 
 						//NOTE: there is a negative gold bug somewhere
 						if (spoilsGold <= 0) {
-							log('WARNING: spoilsGold <= 0', spoilsGold);
+							log('WARNING: spoilsGold <= 0', pendingCombat.attackerId, pendingCombat.defenderId, spoilsGold);
 						}
 
 						//save the combat
diff --git a/src/components/panels/paged_combat_log.jsx b/src/components/panels/paged_combat_log.jsx
index 9ce22b6..bc41dfd 100644
--- a/src/components/panels/paged_combat_log.jsx
+++ b/src/components/panels/paged_combat_log.jsx
@@ -22,6 +22,7 @@ class PagedCombatLog extends React.Component {
 				<div className='row'>
 					<p className='col centered minWidth'>When</p>
 					<p className='col centered minWidth'>Attacker</p>
+					<p className='col centered minWidth'>Defender</p>
 					<p className='col centered minWidth'>Attacking Force</p>
 					<p className='col centered minWidth'>Defending Force</p>
 					<p className='col centered minWidth'>Undefended?</p>
@@ -32,6 +33,7 @@ class PagedCombatLog extends React.Component {
 				{Object.keys(this.state.data).map((key) => <div key={key} className={'row'}>
 					<p className='col centered minWidth'>{ this.parseDate(this.state.data[key].eventTime) }</p>
 					<p className='col centered minWidth'><Link to={`/profile?username=${this.state.data[key].attackerUsername}`} className={'col'}>{this.state.data[key].attackerUsername}</Link></p>
+					<p className='col centered minWidth'><Link to={`/profile?username=${this.state.data[key].defenderUsername}`} className={'col'}>{this.state.data[key].defenderUsername}</Link></p>
 					<p className='col centered minWidth'>{this.state.data[key].attackingUnits}</p>
 					<p className='col centered minWidth'>{this.state.data[key].defendingUnits}</p>
 					<p className='col centered minWidth'>{this.state.data[key].undefended ? 'yes' : 'no'}</p>