diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp
index 95f7af79d3..23b457649d 100644
--- a/src/kits/app/Application.cpp
+++ b/src/kits/app/Application.cpp
@@ -655,6 +655,9 @@ void BApplication::InitData(const char* signature, status_t* error)
 			fMsgPort = appInfo.port;
 		} else
 			appInfo.port = fMsgPort;
+		// check the signature and correct it, if necessary
+		if (strcmp(appInfo.signature, fAppName))
+			be_roster->SetSignature(team, fAppName);
 		// complete the registration
 		fInitError = be_roster->CompleteRegistration(team, thread,
 													 appInfo.port);