diff --git a/modules/authYubiKey/templates/yubikeylogin.php b/modules/authYubiKey/templates/yubikeylogin.php
index 962d1d4f35f584f2c016b46a6755d6998ec6278d..732904decfe2eb202f1a2583d292c3b6070ace7b 100644
--- a/modules/authYubiKey/templates/yubikeylogin.php
+++ b/modules/authYubiKey/templates/yubikeylogin.php
@@ -19,8 +19,8 @@ if ($this->data['errorcode'] !== NULL) {
 }
 ?>
 
-	<img style="float: right" src="<?php echo(SimpleSAML\Module::getModuleURL('authYubiKey/resources/logo.jpg')); ?>" alt="" />
-	<img style="clear: right; float: right" src="<?php echo(SimpleSAML\Module::getModuleURL('authYubiKey/resources/yubikey.jpg')); ?>" alt="YubiKey" />
+	<img style="float: right" src="<?php echo($this->data['logo_url']); ?>" alt="" />
+	<img style="clear: right; float: right" src="<?php echo($this->data['devicepic_url']); ?>" alt="YubiKey" />
 
 
 	<h2 style=""><?php echo $this->t('{authYubiKey:yubikey:header}'); ?></h2>
diff --git a/modules/authYubiKey/www/yubikeylogin.php b/modules/authYubiKey/www/yubikeylogin.php
index 010613c251898120183147ff9d99525a5cb4f00d..91df92ee3438b44e0bbf9c264e0e4280e3e51031 100644
--- a/modules/authYubiKey/www/yubikeylogin.php
+++ b/modules/authYubiKey/www/yubikeylogin.php
@@ -31,5 +31,7 @@ $globalConfig = SimpleSAML_Configuration::getInstance();
 $t = new SimpleSAML_XHTML_Template($globalConfig, 'authYubiKey:yubikeylogin.php');
 $t->data['stateparams'] = array('AuthState' => $authStateId);
 $t->data['errorcode'] = $errorCode;
+$t->data['logo_url'] = SimpleSAML\Module::getModuleURL('authYubiKey/resources/logo.jpg');
+$t->data['devicepic_url'] = SimpleSAML\Module::getModuleURL('authYubiKey/resources/yubikey.jpg')
 $t->show();
 exit();